Merge pull request #5577 from 9rnsr/fix15333

Issue 15333 - Assertion failed: (!fd->vthis->csym), function FuncDeclaration_toObjFile, file glue.c, line 1034

src/declaration.h

@@ -591,6 +591,8 @@ class FuncDeclaration : public Declaration
     // Sibling nested functions which called this one
     FuncDeclarations siblingCallers;
 
+    FuncDeclarations *inlinedNestedCallees;
+
     unsigned flags;                     // FUNCFLAGxxxxx
 
     FuncDeclaration(Loc loc, Loc endloc, Identifier *id, StorageClass storage_class, Type *type);

src/func.d

@@ -484,6 +484,8 @@ public:
     // Sibling nested functions which called this one
     FuncDeclarations siblingCallers;
 
+    FuncDeclarations *inlinedNestedCallees;
+
     uint flags;                         // FUNCFLAGxxxxx
 
     final extern (D) this(Loc loc, Loc endloc, Identifier id, StorageClass storage_class, Type type)

src/glue.c

@@ -881,6 +881,23 @@ void FuncDeclaration_toObjFile(FuncDeclaration *fd, bool multiobj)
     if (fd->isArrayOp)
         s->Sclass = SCcomdat;
 
+    if (fd->inlinedNestedCallees)
+    {
+        /* Bugzilla 15333: If fd contains inlined expressions that come from
+         * nested function bodies, the enclosing of the functions must be
+         * generated first, in order to calculate correct frame pointer offset.
+         */
+        for (size_t i = 0; i < fd->inlinedNestedCallees->dim; i++)
+        {
+            FuncDeclaration *f = (*fd->inlinedNestedCallees)[i];
+            FuncDeclaration *fp = f->toParent2()->isFuncDeclaration();;
+            if (fp && fp->semanticRun < PASSobj)
+            {
+                toObjFile(fp, multiobj);
+            }
+        }
+    }
+
     if (fd->isNested())
     {
         //if (!(config.flags3 & CFG3pic))

src/inline.d

@@ -2069,6 +2069,13 @@ void expandInline(Loc callLoc, FuncDeclaration fd, FuncDeclaration parent, Expre
     }
     scope ids = new InlineDoState(parent, fd);
 
+    if (fd.isNested())
+    {
+        if (!parent.inlinedNestedCallees)
+            parent.inlinedNestedCallees = new FuncDeclarations();
+        parent.inlinedNestedCallees.push(fd);
+    }
+
     VarDeclaration vret;    // will be set the function call result
     if (eret)
     {

test/compilable/ice15333.d

@@ -0,0 +1,14 @@
+// EXTRA_SOURCES: imports/a15333.d
+
+module ice15333;
+
+void map(alias fun)() {}
+
+struct IdentifierResolver(alias handler)
+{
+    void resolve()
+    {
+        map!((a) {});
+        handler(true);
+    }
+}

test/compilable/imports/a15333.d

@@ -0,0 +1,12 @@
+module imports.a15333;
+
+import ice15333;
+
+struct StatementVisitor
+{
+    void visit()
+    {
+        int location;
+        alias IR = IdentifierResolver!((e){ location = 0; });
+    }
+}