maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Code gen for array construction - WIP 

llvm-svn: 85432
This commit is contained in:
Fariborz Jahanian 2009-10-28 20:55:41 +00:00
parent 97b9312663
commit f1639fffbc
2 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clang/lib/CodeGen/CGCXX.cpp
View File

@ -594,8 +594,11 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest,
// For a copy constructor, even if it is trivial, must fall thru so
// its argument is code-gen'ed.
if (!CD->isCopyConstructor(getContext())) {
QualType InitType = E->getType();
if (const ArrayType *Array = getContext().getAsArrayType(InitType))
InitType = getContext().getBaseElementType(Array);
const CXXRecordDecl *RD =
cast<CXXRecordDecl>(E->getType()->getAs<RecordType>()->getDecl());
cast<CXXRecordDecl>(InitType->getAs<RecordType>()->getDecl());
if (RD->hasTrivialConstructor())
return;
}
@ -606,9 +609,19 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest,
EmitAggExpr((*i), Dest, false);
return;
}
// Call the constructor.
EmitCXXConstructorCall(CD, Ctor_Complete, Dest,
E->arg_begin(), E->arg_end());
if (const ConstantArrayType *Array =
getContext().getAsConstantArrayType(E->getType())) {
QualType BaseElementTy = getContext().getBaseElementType(Array);
const llvm::Type *BasePtr = ConvertType(BaseElementTy);
BasePtr = llvm::PointerType::getUnqual(BasePtr);
llvm::Value *BaseAddrPtr =
Builder.CreateBitCast(Dest, BasePtr);
EmitCXXAggrConstructorCall(CD, Array, BaseAddrPtr);
}
else
// Call the constructor.
EmitCXXConstructorCall(CD, Ctor_Complete, Dest,
E->arg_begin(), E->arg_end());
}
void CodeGenModule::EmitCXXConstructors(const CXXConstructorDecl *D) {

40
clang/test/CodeGenCXX/array-construction.cpp Normal file
View File

@ -0,0 +1,40 @@
// 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(...);
static int count;
static float fcount;
class xpto {
public:
xpto() : i(count++), f(fcount++) {
printf("xpto::xpto()\n");
}
int i;
float f;
/**
NYI
~xpto() {
printf("xpto::~xpto()\n");
}
*/
};
int main() {
xpto array[2][3][4];
for (int h = 0; h < 2; h++)
for (int i = 0; i < 3; i++)
for (int j = 0; j < 4; j++)
printf("array[%d][%d][%d] = {%d, %f}\n",
h, i, j, array[h][i][j].i, array[h][i][j].f);
}
// CHECK-LP64: call __ZN4xptoC1Ev
// CHECK-LP32: call L__ZN4xptoC1Ev