Issue 7261 - ICE(glue.c): With taskPool.reduce

src/inline.c

@@ -191,6 +191,7 @@ int lambdaInlineCost(Expression *e, void *param)
 int expressionInlineCost(Expression *e, InlineCostState *ics)
 {
     //printf("expressionInlineCost()\n");
+    //e->dump(0);
     ICS2 ics2;
     ics2.cost = 0;
     ics2.ics = ics;
@@ -223,7 +224,7 @@ int VarExp::inlineCost3(InlineCostState *ics)
             return COST_MAX;
     }
     FuncDeclaration *fd = var->isFuncDeclaration();
-    if (fd && fd->isNested())
+    if (fd && fd->isNested())           // see Bugzilla 7199 for test case
         return COST_MAX;
     return 1;
 }
@@ -349,6 +350,7 @@ struct InlineDoState
     Dsymbols from;      // old Dsymbols
     Dsymbols to;        // parallel array of new Dsymbols
     Dsymbol *parent;    // new parent
+    FuncDeclaration *fd; // function being inlined (old parent)
 };
 
 /* -------------------------------------------------------------------- */
@@ -644,6 +646,12 @@ Expression *VarExp::doInline(InlineDoState *ids)
             return ve;
         }
     }
+    if (ids->fd && var == ids->fd->vthis)
+    {   VarExp *ve = new VarExp(loc, ids->vthis);
+        ve->type = type;
+        return ve;
+    }
+
     return this;
 }
 
@@ -1586,6 +1594,7 @@ Expression *FuncDeclaration::expandInline(InlineScanState *iss, Expression *ethi
 
     memset(&ids, 0, sizeof(ids));
     ids.parent = iss->fd;
+    ids.fd = this;
 
     if (ps)
         as = new Statements();

test/runnable/inline.d

@@ -141,6 +141,48 @@ void test7()
     auto x = foo7('c');
 }
 
+/************************************/
+// Bugzilla 4825
+
+int a8() {
+    int r;
+    return r;
+}
+
+int b8() {
+    return a8();
+}
+
+void test8() {
+    void d() {
+        auto e = b8();
+    }
+    static const int f = b8();
+}
+
+/************************************/
+// 7261
+
+struct AbstractTask
+{
+    ubyte taskStatus;
+}
+
+struct Task
+{
+    AbstractTask base;
+    alias base this;
+
+    void opAssign(Task rhs)
+    {
+    }
+
+    ~this()
+    {
+        if (taskStatus != 3) { }
+    }
+}
+
 /************************************/
 
 int main()
@@ -152,6 +194,7 @@ int main()
     test5();
     test6();
     test7();
+    test8();
 
     printf("Success\n");
     return 0;