Test case for my last patch plus a minor clean up.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@79500 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 47 insertions, 4 deletions

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index b564a08501..d3dad897a8 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -375,26 +375,24 @@ CodeGenFunction::EmitCXXAggrConstructorCall(const CXXConstructorDecl *D,
   
   llvm::BasicBlock *ContinueBlock = createBasicBlock("for.inc");
   // Inside the loop body, emit the constructor call on the array element.
+  Counter = Builder.CreateLoad(IndexPtr);
   if (const ConstantArrayType *CAT = 
       dyn_cast<ConstantArrayType>(Array->getElementType())) {
-    // Need to call this routine again.
     uint32_t delta = 1;
     const ConstantArrayType *CAW = CAT;
     do {
       delta *= CAW->getSize().getZExtValue();
       CAW = dyn_cast<ConstantArrayType>(CAW->getElementType());
     } while (CAW);
-    // Address = This + delta*Counter
+    // Address = This + delta*Counter for current loop iteration.
     llvm::Value *DeltaPtr = 
       llvm::ConstantInt::get(llvm::Type::getInt32Ty(VMContext), delta);
-    Counter = Builder.CreateLoad(IndexPtr);
     DeltaPtr = Builder.CreateMul(Counter, DeltaPtr, "mul");
     llvm::Value *Address = 
       Builder.CreateInBoundsGEP(This, DeltaPtr, "arrayidx");
     EmitCXXAggrConstructorCall(D, CAT, Address);
   } 
   else {
-    Counter = Builder.CreateLoad(IndexPtr);
     llvm::Value *Address = Builder.CreateInBoundsGEP(This, Counter, "arrayidx");
     EmitCXXConstructorCall(D, Ctor_Complete, Address, 0, 0);
   }
diff --git a/test/CodeGenCXX/constructor-for-array-members.cpp b/test/CodeGenCXX/constructor-for-array-members.cpp
new file mode 100644
index 0000000000..f0f7f51ac0
--- /dev/null
+++ b/test/CodeGenCXX/constructor-for-array-members.cpp
@@ -0,0 +1,45 @@
+// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s &&
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
+// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s &&
+// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
+// RUN: true
+
+extern "C" int printf(...);
+
+int i = 1234;
+float vf = 1.00;
+
+struct S {
+  S() : iS(i++), f1(vf++) {printf("S::S()\n");}
+//  ~S(){printf("S::~S()\n"); }
+  int iS;
+  float f1;
+};
+
+struct M {
+  double dM;
+  S ARR_S[3];
+  void pr() {
+    for (int i = 0; i < 3; i++)
+     printf("ARR_S[%d].iS = %d ARR_S[%d].f1 = %f\n", i, ARR_S[i].iS, i, ARR_S[i].f1);
+
+    for (int i = 0; i < 2; i++)
+      for (int j = 0; j < 3; j++)
+        for (int k = 0; k < 4; k++)
+           printf("MULTI_ARR[%d][%d][%d].iS = %d MULTI_ARR[%d][%d][%d].f1 = %f\n", 
+                  i,j,k, MULTI_ARR[i][j][k].iS, i,j,k, MULTI_ARR[i][j][k].f1);
+
+  }
+
+ S MULTI_ARR[2][3][4];
+};
+
+int main() {
+	M m1;
+	m1.pr();
+
+}
+
+// CHECK-LP64: call	__ZN1SC1Ev
+
+// CHECK-LP32: call	L__ZN1SC1Ev