fix Issue 11487 - dmd segfaults on writefln in nested template

dlang · Nov 22, 2013 · 7d3752c · 7d3752c
1 parent 40c8ba9
commit 7d3752c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/template.c b/src/template.c
@@ -5282,9 +5282,11 @@ void TemplateInstance::semantic(Scope *sc)
 void TemplateInstance::expandMembers(Scope *sc2)
 {
     for (size_t i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (*members)[i];
+    {
+        Dsymbol *s = (*members)[i];
         s->setScope(sc2);
     }
+
     for (size_t i = 0; i < members->dim; i++)
     {
         Dsymbol *s = (*members)[i];
@@ -7548,6 +7550,12 @@ void TemplateMixin::semantic(Scope *sc)
         fatal();
     }
 
+    for (size_t i = 0; i < members->dim; i++)
+    {
+        Dsymbol *s = (*members)[i];
+        s->setScope(sc2);
+    }
+
     for (size_t i = 0; i < members->dim; i++)
     {
         Dsymbol *s = (*members)[i];

diff --git a/test/runnable/mixin1.d b/test/runnable/mixin1.d
@@ -1185,6 +1185,33 @@ void test9417()
     }
 }
 
+/*******************************************/
+// 11487
+
+template X11487()
+{
+    struct R()
+    {
+        C11487 c;
+
+        ~this()
+        {
+            static assert(is(typeof(c.front) == void));
+        }
+    }
+    template Mix(alias R)
+    {
+        R!() range;
+        @property front() inout {}
+    }
+}
+
+class C11487
+{
+    alias X11487!() M;
+    mixin M.Mix!(M.R);
+}
+
 /*******************************************/
 
 int main()