Merge pull request #935 from 9rnsr/fix8069

Issue 8069 - incorrect ambiguous virtual function error
dlang · May 10, 2012 · f35c12a · f35c12a
2 parents cbbfc0a + 634453f
commit f35c12a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/class.c b/src/class.c
@@ -1057,6 +1057,8 @@ FuncDeclaration *ClassDeclaration::findFunc(Identifier *ident, TypeFunction *tf)
             {   //printf("fd->parent->isClassDeclaration() = %p\n", fd->parent->isClassDeclaration());
                 if (!fdmatch)
                     goto Lfd;
+                if (fd == fdmatch)
+                    goto Lfdmatch;
 
                 {
                 // Function type matcing: exact > covariant

diff --git a/test/runnable/mixin1.d b/test/runnable/mixin1.d
@@ -1147,8 +1147,8 @@ class B8032a : A8032a
 
 class A8032b
 {
-    mixin T8032; // Named mixin causes the error too
     void f() { }
+    mixin T8032; // Named mixin causes the error too
 }
 class B8032b : A8032b
 {

diff --git a/test/runnable/test42.d b/test/runnable/test42.d
@@ -5007,6 +5007,22 @@ void test4155()
     assert(getnanr() != 0);
 }
 
+/***************************************************/
+// 8069
+
+interface I8069
+{
+    void f();
+}
+struct A8069
+{
+    final class B8069 : I8069
+    {
+        A8069 a;
+        void f() {}
+    }
+}
+
 /***************************************************/
 
 int main()