Merge pull request #3665 from 9rnsr/fix12906

[REG2.066a] Issue 12906 - [CTFE] Static array of structs causes postblit call
dlang · Jun 15, 2014 · 266ab51 · 266ab51
2 parents 1686e60 + 790212f
commit 266ab51
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -4017,7 +4017,7 @@ class Interpreter : public Visitor
                 else
                 {
                     setValue(v, newval);
-                    if (tyE1 == Tsarray && e->e2->isLvalue())
+                    if (e->op != TOKblit && tyE1 == Tsarray && e->e2->isLvalue())
                     {
                         assert(newval->op == TOKarrayliteral);
                         ArrayLiteralExp *ale = (ArrayLiteralExp *)newval;
@@ -4560,7 +4560,7 @@ class Interpreter : public Visitor
             {
                 (*oldelems)[(size_t)(j + firstIndex)] = paintTypeOntoLiteral(elemtype, (*newelems)[j]);
             }
-            if (originalExp->e2->isLvalue())
+            if (originalExp->op != TOKblit && originalExp->e2->isLvalue())
             {
                 Expression *x = evaluatePostblits(istate, existingAE, 0, oldelems->dim);
                 if (exceptionOrCantInterpret(x))
@@ -4644,7 +4644,7 @@ class Interpreter : public Visitor
                         assignInPlace((*existingAE->elements)[(size_t)(j+firstIndex)], newval);
                 }
             }
-            if (!wantRef && !cow && originalExp->e2->isLvalue())
+            if (!wantRef && !cow && originalExp->op != TOKblit && originalExp->e2->isLvalue())
             {
                 Expression *x = evaluatePostblits(istate, existingAE, (size_t)firstIndex, (size_t)(firstIndex+upperbound-lowerbound));
                 if (exceptionOrCantInterpret(x))

diff --git a/test/compilable/interpret3.d b/test/compilable/interpret3.d
@@ -6088,6 +6088,17 @@ bool test9245()
 }
 static assert(test9245());
 
+/**************************************************
+    12906 don't call postblit on blit initializing
+**************************************************/
+
+struct S12906 { this(this) { assert(0); } }
+
+static assert({
+    S12906[1] arr;
+    return true;
+}());
+
 /**************************************************
     11510 support overlapped field access in CTFE
 **************************************************/