Merge pull request #579 from ibuclaw/bug282

Fix Bug 282: internal compiler error: in chainon, at tree.c:2865

Author: ibuclaw

gcc/d/ChangeLog

@@ -1,3 +1,8 @@
+2017-12-10  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* types.cc (TypeVisitor::visit(TypeClass)): Check for duplicate
+	declarations before adding method.
+
 2017-12-09  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* expr.cc (ExprVisitor::visit(AddrExp)): Build internal struct literal

gcc/d/types.cc

@@ -941,7 +941,8 @@ class TypeVisitor : public Visitor
 	FuncDeclaration *fd = t->sym->vtbl[i]->isFuncDeclaration ();
 	tree method = fd ? get_symbol_decl (fd) : NULL_TREE;
 
-	if (method && DECL_CONTEXT (method) == basetype)
+	if (method && DECL_CONTEXT (method) == basetype
+	    && !chain_member (method, TYPE_FIELDS (basetype)))
 	  TYPE_FIELDS (basetype) = chainon (TYPE_FIELDS (basetype), method);
       }
 

gcc/testsuite/gdc.dg/gdc282.d

@@ -0,0 +1,46 @@
+// Bug 282
+
+class C282a
+{
+    void fun()
+    {
+    }
+
+    void f282()
+    {
+    }
+
+    void f282() // { dg-error "conflicts with gdc282.C282a.f282" }
+    {
+    }
+}
+
+class C282b
+{
+    struct S282b
+    {
+    }
+
+    void f282()
+    {
+    }
+
+    void f282() // { dg-error "conflicts with gdc282.C282b.f282" }
+    {
+    }
+}
+
+class C282c
+{
+    class C282c
+    {
+    }
+
+    void f282()
+    {
+    }
+
+    void f282() // { dg-error "conflicts with gdc282.C282c.f282" }
+    {
+    }
+}