Merge branch 'stable' into merge_stable

Conflicts: src/expression.c src/func.c src/posix.mak src/win32.mak test/runnable/opover.d
dlang · Apr 25, 2015 · 84b9186 · 84b9186
2 parents c5f2740 + 779e52c
commit 84b9186
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -4222,9 +4222,9 @@ class Interpreter : public Visitor
                     newelem = paintTypeOntoLiteral(elemtype, newelem);
                     if (needsPostblit)
                     {
-                        newelem = evaluatePostblit(istate, newelem);
-                        if (exceptionOrCantInterpret(newelem))
-                            return newelem;
+                        Expression *x = evaluatePostblit(istate, newelem);
+                        if (exceptionOrCantInterpret(x))
+                            return x;
                     }
                     (*oldelems)[(size_t)(j + firstIndex)] = newelem;
                 }

diff --git a/test/compilable/interpret3.d b/test/compilable/interpret3.d
@@ -7387,6 +7387,20 @@ static assert(
     return 1;
 }());
 
+/**************************************************
+    14463 - ICE on slice assignment without postblit
+**************************************************/
+
+struct Boo14463
+{
+    private int[1] c;
+    this(int[] x)
+    {
+        c = x;
+    }
+}
+immutable Boo14463 a14463 = Boo14463([1]);
+
 /**************************************************
     13295 - Don't copy struct literal in VarExp::interpret()
 **************************************************/