mirror of
https://github.com/llvm/llvm-project.git
synced 2025-05-05 15:16:06 +00:00
Test case for my last patch plus a minor clean up.
llvm-svn: 79500
This commit is contained in:
parent
d982f001c9
commit
dd46eb770f
@ -375,26 +375,24 @@ CodeGenFunction::EmitCXXAggrConstructorCall(const CXXConstructorDecl *D,
|
|||||||
|
|
||||||
llvm::BasicBlock *ContinueBlock = createBasicBlock("for.inc");
|
llvm::BasicBlock *ContinueBlock = createBasicBlock("for.inc");
|
||||||
// Inside the loop body, emit the constructor call on the array element.
|
// Inside the loop body, emit the constructor call on the array element.
|
||||||
|
Counter = Builder.CreateLoad(IndexPtr);
|
||||||
if (const ConstantArrayType *CAT =
|
if (const ConstantArrayType *CAT =
|
||||||
dyn_cast<ConstantArrayType>(Array->getElementType())) {
|
dyn_cast<ConstantArrayType>(Array->getElementType())) {
|
||||||
// Need to call this routine again.
|
|
||||||
uint32_t delta = 1;
|
uint32_t delta = 1;
|
||||||
const ConstantArrayType *CAW = CAT;
|
const ConstantArrayType *CAW = CAT;
|
||||||
do {
|
do {
|
||||||
delta *= CAW->getSize().getZExtValue();
|
delta *= CAW->getSize().getZExtValue();
|
||||||
CAW = dyn_cast<ConstantArrayType>(CAW->getElementType());
|
CAW = dyn_cast<ConstantArrayType>(CAW->getElementType());
|
||||||
} while (CAW);
|
} while (CAW);
|
||||||
// Address = This + delta*Counter
|
// Address = This + delta*Counter for current loop iteration.
|
||||||
llvm::Value *DeltaPtr =
|
llvm::Value *DeltaPtr =
|
||||||
llvm::ConstantInt::get(llvm::Type::getInt32Ty(VMContext), delta);
|
llvm::ConstantInt::get(llvm::Type::getInt32Ty(VMContext), delta);
|
||||||
Counter = Builder.CreateLoad(IndexPtr);
|
|
||||||
DeltaPtr = Builder.CreateMul(Counter, DeltaPtr, "mul");
|
DeltaPtr = Builder.CreateMul(Counter, DeltaPtr, "mul");
|
||||||
llvm::Value *Address =
|
llvm::Value *Address =
|
||||||
Builder.CreateInBoundsGEP(This, DeltaPtr, "arrayidx");
|
Builder.CreateInBoundsGEP(This, DeltaPtr, "arrayidx");
|
||||||
EmitCXXAggrConstructorCall(D, CAT, Address);
|
EmitCXXAggrConstructorCall(D, CAT, Address);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Counter = Builder.CreateLoad(IndexPtr);
|
|
||||||
llvm::Value *Address = Builder.CreateInBoundsGEP(This, Counter, "arrayidx");
|
llvm::Value *Address = Builder.CreateInBoundsGEP(This, Counter, "arrayidx");
|
||||||
EmitCXXConstructorCall(D, Ctor_Complete, Address, 0, 0);
|
EmitCXXConstructorCall(D, Ctor_Complete, Address, 0, 0);
|
||||||
}
|
}
|
||||||
|
45
clang/test/CodeGenCXX/constructor-for-array-members.cpp
Normal file
45
clang/test/CodeGenCXX/constructor-for-array-members.cpp
Normal file
@ -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
|
Loading…
x
Reference in New Issue
Block a user