Attempt to fix issue ldc-developers#1608

redstar · Jul 29, 2016 · b9ee9e9 · b9ee9e9
1 parent 7974fdd
commit b9ee9e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/gen/arrays.cpp b/gen/arrays.cpp
@@ -246,9 +246,6 @@ void DtoArrayAssign(Loc &loc, DValue *lhs, DValue *rhs, int op,
   Type *const elemType = t->nextOf()->toBasetype();
   const bool needsDestruction =
       (!isConstructing && elemType->needsDestruction());
-  const bool needsPostblit =
-      (op != TOKblit && !canSkipPostblit && arrayNeedsPostblit(t));
-
   LLValue *realLhsPtr = DtoArrayPtr(lhs);
   LLValue *lhsPtr = DtoBitCast(realLhsPtr, getVoidPtrType());
   LLValue *lhsLength = DtoArrayLen(lhs);
@@ -264,6 +261,11 @@ void DtoArrayAssign(Loc &loc, DValue *lhs, DValue *rhs, int op,
     LLValue *rhsPtr = DtoBitCast(realRhsArrayPtr, getVoidPtrType());
     LLValue *rhsLength = DtoArrayLen(rhs);
 
+    if (t2->ty == Tarray)
+      canSkipPostblit = false;
+    const bool needsPostblit =
+        (op != TOKblit && !canSkipPostblit && arrayNeedsPostblit(t));
+
     if (!needsDestruction && !needsPostblit) {
       // fast version
       LLValue *elemSize =
@@ -296,6 +298,9 @@ void DtoArrayAssign(Loc &loc, DValue *lhs, DValue *rhs, int op,
       call.setCallingConv(llvm::CallingConv::C);
     }
   } else {
+    const bool needsPostblit =
+        (op != TOKblit && !canSkipPostblit && arrayNeedsPostblit(t));
+
     // scalar rhs:
     // T[]  = T     T[n][]  = T
     // T[n] = T     T[n][m] = T

diff --git a/tests/d2/dmd-testsuite b/tests/d2/dmd-testsuite