Merge pull request #245 from jpf91/231

Fix issue 231 (mixin template emitted into multiple object files)

gcc/d/ChangeLog

@@ -1,3 +1,7 @@
+2016-09-26  Johannes Pfau  <johannespfau@gmail.com>
+
+	* d-objfile.cc (d_finish_function): Handle template mixins (issue 231).
+
 2016-09-18  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* imports.cc (ImportVisitor::visit(ScopeDsymbol)): New visit method.

gcc/d/d-objfile.cc

@@ -1897,18 +1897,10 @@ d_finish_function(FuncDeclaration *fd)
   // If we generated the function, but it's really extern.
   // Such as external inlinable functions or thunk aliases.
   bool extern_p = false;
-  for (FuncDeclaration *fdp = fd; fdp != NULL;)
-    {
-      if (fdp->inNonRoot())
-	{
-	  extern_p = true;
-	  break;
-	}
-
-      if (!fdp->isNested())
-	break;
 
-      fdp = fdp->toParent2()->isFuncDeclaration();
+  if (!fd->isInstantiated() && fd->getModule() && !fd->getModule()->isRoot())
+    {
+      extern_p = true;
     }
 
   if (extern_p)

gcc/testsuite/gdc.test/compilable/gdc231.d

@@ -0,0 +1,16 @@
+// EXTRA_SOURCES: imports/gdc231a.d
+module gdc231;
+
+import imports.gdc231a;
+
+class Range : Widget
+{
+    void* getStruct()
+    {
+        return null;
+    }
+}
+
+void main()
+{
+}

gcc/testsuite/gdc.test/compilable/gdc27.d

@@ -0,0 +1,18 @@
+// EXTRA_SOURCES: imports/gdc27a.d
+module gdc27;
+
+import imports.gdc27a;
+
+interface I_B : I_A
+{
+    void b();
+}
+
+abstract class C_B : C_A, I_B
+{
+    abstract void b();
+}
+
+void main()
+{
+}

gcc/testsuite/gdc.test/compilable/imports/gdc231a.d

@@ -0,0 +1,24 @@
+module imports.gdc231a;
+
+interface ImplementorIF
+{
+    void* getImplementorStruct();
+    void* getStruct();
+}
+
+template ImplementorT()
+{
+    void* getImplementorStruct()
+    {
+        return null;
+    }
+}
+
+class Widget : ImplementorIF
+{
+    mixin ImplementorT;
+    void* getStruct()
+    {
+        return null;
+    }
+}

gcc/testsuite/gdc.test/compilable/imports/gdc27a.d

@@ -0,0 +1,14 @@
+module imports.gdc27a;
+
+interface I_A
+{
+    bool a();
+}
+
+class C_A : I_A
+{
+    bool a()
+    {
+        return false;
+    }
+}