fix Issue 7595 - Data being overwritten.

src/declaration.h

@@ -603,6 +603,7 @@ struct FuncDeclaration : Declaration
     VarDeclarations closureVars;        // local variables in this function
                                         // which are referenced by nested
                                         // functions
+    FuncDeclarations deferred;          // toObjFile() these functions after this one
 
     unsigned flags;
     #define FUNCFLAGpurityInprocess 1   // working on determining purity

src/e2ir.c

@@ -3428,7 +3428,9 @@ elem *DelegateExp::toElem(IRState *irs)
     //printf("DelegateExp::toElem() '%s'\n", toChars());
 
     if (func->semanticRun == PASSsemantic3done)
+    {
         irs->deferToObj->push(func);
+    }
 
     sfunc = func->toSymbol();
     if (func->isNested())

src/glue.c

@@ -975,10 +975,32 @@ void FuncDeclaration::toObjFile(int multiobj)
 
     for (size_t i = 0; i < irs.deferToObj->dim; i++)
     {
-        Dsymbol *s = irs.deferToObj->tdata()[i];
+        Dsymbol *s = (*irs.deferToObj)[i];
+
+        FuncDeclaration *fd = s->isFuncDeclaration();
+        if (fd)
+        {   FuncDeclaration *fdp = fd->toParent2()->isFuncDeclaration();
+            if (fdp && fdp->semanticRun < PASSobj)
+            {   /* Bugzilla 7595
+                 * FuncDeclaration::buildClosure() relies on nested functions
+                 * being toObjFile'd after the outer function. Otherwise, the
+                 * v->offset's for the closure variables are wrong.
+                 * So, defer fd until after fdp is done.
+                 */
+                fdp->deferred.push(fd);
+                continue;
+            }
+        }
+
         s->toObjFile(0);
     }
 
+    for (size_t i = 0; i < deferred.dim; i++)
+    {
+        FuncDeclaration *fd = deferred[i];
+        fd->toObjFile(0);
+    }
+
 #if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
     // A hack to get a pointer to this function put in the .dtors segment
     if (ident && memcmp(ident->toChars(), "_STD", 4) == 0)