fix Issue 14975 - DMD refuses to inline even trivial struct constructors

dlang · Sep 4, 2015 · 5455721 · 5455721
1 parent adc51b1
commit 5455721
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/expression.d b/src/expression.d
@@ -8909,11 +8909,12 @@ public:
                         return new ErrorExp();
                     // Bugzilla 14556: Set concrete type to avoid further redundant semantic().
                     sle.type = e1.type;
-                    /* Copy from the initializer symbol for larger symbols,
-                     * otherwise the literals expressed as code get excessively large.
+
+                    /* Constructor takes a mutable object, so don't use
+                     * the immutable initializer symbol.
                      */
-                    if (sd.size(loc) > Target.ptrsize * 4 && !t1.needsNested())
-                        sle.sinit = toInitializer(sd);
+                    sle.sinit = null;
+
                     Expression e = sle;
                     if (CtorDeclaration cf = sd.ctor.isCtorDeclaration())
                     {

diff --git a/src/func.d b/src/func.d
@@ -1753,6 +1753,7 @@ public:
                         Statement s = new ReturnStatement(loc, null);
                         s = s.semantic(sc2);
                         fbody = new CompoundStatement(loc, fbody, s);
+                        hasReturnExp |= 1;
                     }
                 }
                 else if (fes)
@@ -1763,6 +1764,7 @@ public:
                         Expression e = new IntegerExp(0);
                         Statement s = new ReturnStatement(Loc(), e);
                         fbody = new CompoundStatement(Loc(), fbody, s);
+                        hasReturnExp |= 1;
                     }
                     assert(!returnLabel);
                 }

diff --git a/test/runnable/inline.d b/test/runnable/inline.d
@@ -736,6 +736,22 @@ void test14753(string) { }
 
 /**********************************/
 
+struct S14975 {
+    int bar;
+
+    pragma(inline, true) this(int bar) {
+        this.bar = bar;
+    }
+}
+
+void test14975() {
+    S14975 baz = 1;
+    if (baz.bar != 1)
+	assert(0);
+}
+
+/**********************************/
+
 int main()
 {
     test1();
@@ -760,6 +776,7 @@ int main()
     test14306();
     test14754();
     test14606();
+    test14975();
 
     printf("Success\n");
     return 0;