Fix regression case, defer string mixin resolution

dlang · May 13, 2015 · 0bbde0b · 0bbde0b
1 parent a0791d5
commit 0bbde0b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/attrib.c b/src/attrib.c
@@ -1284,11 +1284,12 @@ Dsymbol *CompileDeclaration::syntaxCopy(Dsymbol *s)
 int CompileDeclaration::addMember(Scope *sc, ScopeDsymbol *sds, int memnum)
 {
     //printf("CompileDeclaration::addMember(sc = %p, sds = %p, memnum = %d)\n", sc, sds, memnum);
+#if 0
     if (compiled)
         return 1;
-
+#endif
     this->scopesym = sds;
-
+#if 0
     if (memnum == 0)
     {
         /* No members yet, so parse the mixin now
@@ -1297,6 +1298,7 @@ int CompileDeclaration::addMember(Scope *sc, ScopeDsymbol *sds, int memnum)
         memnum |= AttribDeclaration::addMember(sc, sds, memnum);
         compiled = 1;
     }
+#endif
     return memnum;
 }
 

diff --git a/test/compilable/testfwdref.d b/test/compilable/testfwdref.d
@@ -458,3 +458,22 @@ class Frop14549
 
     static if (!__traits(isVirtualMethod, this.bar)) {}
 }
+
+// ----
+
+template Mix14549()
+{
+    mixin(code14549!(typeof(this)));
+}
+
+template code14549(T)
+{
+    enum string code14549 =
+        q{ static if (!__traits(isVirtualMethod, "boo")) {} };
+}
+
+class Bar14549
+{
+    mixin Mix14549;
+    int boo;
+}