fix Issue 17622 - [REG2.075.0-b1] Wrong code with appender and -inline

dlang · Aug 3, 2017 · c73fe97 · c73fe97
1 parent 95dba7d
commit c73fe97
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/ddmd/e2ir.d b/src/ddmd/e2ir.d
@@ -2903,7 +2903,8 @@ elem *toElem(Expression e, IRState *irs)
                  * and have the structliteral write into v, rather than create a temporary
                  * and copy the temporary into v
                  */
-                if (ae.e1.op == TOKvar && ce.e1.op == TOKdotvar)
+                if (e1.Eoper == OPvar && // no closure variables https://issues.dlang.org/show_bug.cgi?id=17622
+                    ae.e1.op == TOKvar && ce.e1.op == TOKdotvar)
                 {
                     auto dve = cast(DotVarExp)ce.e1;
                     auto fd = dve.var.isFuncDeclaration();

diff --git a/test/runnable/structlit.d b/test/runnable/structlit.d
@@ -1442,6 +1442,38 @@ void test14556()
     assert(sb.data[] == cast(ubyte[1])[0]);
 }
 
+/********************************************/
+// https://issues.dlang.org/show_bug.cgi?id=17622
+
+struct S17622
+{
+    int i;
+
+    this(ubyte)
+    {
+        return;
+    }
+
+    void fun()
+    {
+        assert(i == 0);
+    }
+}
+
+S17622 make()
+{
+    return S17622(0);
+}
+
+void test17622()
+{
+    S17622 s = make();
+
+    auto rdg = (){ s.fun(); };
+
+    s.fun();
+}
+
 /********************************************/
 
 int main()
@@ -1489,6 +1521,7 @@ int main()
     test11256();
     test13021();
     test14556();
+    test17622();
 
     printf("Success\n");
     return 0;