Fix 'enclosing' symbol propagation in TemplateInstance::hasNestedArgs

dlang · Sep 9, 2015 · e7898a6 · e7898a6
1 parent d96a649
commit e7898a6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/template.c b/src/template.c
@@ -7167,6 +7167,12 @@ bool TemplateInstance::hasNestedArgs(Objects *args, bool isstatic)
     int nested = 0;
     //printf("TemplateInstance::hasNestedArgs('%s')\n", tempdecl->ident->toChars());
 
+    if (!enclosing)
+    {
+        if (TemplateInstance *ti = tempdecl->isInstantiated())
+            enclosing = ti->enclosing;
+    }
+
     /* A nested instance happens when an argument references a local
      * symbol that is on the stack.
      */
@@ -7294,6 +7300,10 @@ Dsymbols *TemplateInstance::appendToModuleMember()
             mi = NULL;
     }
 
+    //printf("%s->appendToModuleMember() enclosing = %s mi = %s\n",
+    //    toPrettyChars(),
+    //    enclosing ? enclosing->toPrettyChars() : NULL,
+    //    mi ? mi->toPrettyChars() : NULL);
     if (!mi || mi->isRoot())
     {
         /* If the instantiated module is speculative or root, insert to the
@@ -7304,7 +7314,7 @@ Dsymbols *TemplateInstance::appendToModuleMember()
 
         // insert target is made stable by using the module
         // where tempdecl is declared.
-        mi = tempdecl->getModule();
+        mi = (enclosing ? enclosing : tempdecl)->getModule();
         if (!mi->isRoot())
             mi = mi->importedFrom;
         assert(mi->isRoot());
@@ -7317,6 +7327,7 @@ Dsymbols *TemplateInstance::appendToModuleMember()
          *  - codegen pass won't reach to the instance.
          */
     }
+    //printf("\t--> mi = %s\n", mi->toPrettyChars());
 
     Dsymbols *a = mi->members;
     for (size_t i = 0; 1; i++)

diff --git a/test/runnable/ice15030.d b/test/runnable/ice15030.d
@@ -68,4 +68,25 @@ function  b.__unittestL5_2.__lambda1.__lambda2.__lambda2
 
 By using `deferredNested` correctly, those nested function generations are ordered again.
 
+
+Fixed more:
+--------
+function  D main
+code      a
+code      b
+function  b.__unittestL5_2
+function  b.__unittestL5_2.__lambda1
+function  b.__unittestL5_2.__lambda1.__lambda2
+function  b.__unittestL5_2.__lambda1.__lambda2.filter!(int[]).filter
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.this
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.empty
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.front
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.popFront
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.__xopEquals
+function  b.__unittestL5_2.__lambda1.__lambda2.FilterResult!(__lambda2, int[]).FilterResult.__xtoHash
+function  b.__unittestL5_2.__lambda1.__lambda2.__lambda2
+
+Another problem is in TemplateInstance::hasNestedArgs. By inheriting 'enclosing' of instantiated scope,
+now 'filter!(int[])' also becomes a nested template, and then FilterResult!(...) goes into the module b.
+
 +/