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

Improved on ir-gen for synthesis of non-trivial default 

constructor body whose class has non-static data-members which
required non-trivial construction.

llvm-svn: 79125
This commit is contained in:
Fariborz Jahanian 2009-08-15 18:55:17 +00:00
parent 724af2ca77
commit 0aed0225b4
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1129,6 +1129,29 @@ void CodeGenFunction::EmitCtorPrologue(const CXXConstructorDecl *CD) {
}
}
if (!CD->isTrivial() && CD->getNumBaseOrMemberInitializers() == 0)
// Nontrivial default constructor with no initializer list. It may still
// contain non-static data members which require construction.
for (CXXRecordDecl::field_iterator Field = ClassDecl->field_begin(),
FieldEnd = ClassDecl->field_end();
Field != FieldEnd; ++Field) {
QualType FieldType = getContext().getCanonicalType((*Field)->getType());
if (!FieldType->getAs<RecordType>() || Field->isAnonymousStructOrUnion())
continue;
const RecordType *ClassRec = FieldType->getAs<RecordType>();
if (CXXRecordDecl *MemberClassDecl =
dyn_cast<CXXRecordDecl>(ClassRec->getDecl())) {
if (MemberClassDecl->hasTrivialConstructor())
continue;
if (CXXConstructorDecl *MamberCX =
MemberClassDecl->getDefaultConstructor(getContext())) {
LoadOfThis = LoadCXXThis();
LValue LHS = EmitLValueForField(LoadOfThis, *Field, false, 0);
EmitCXXConstructorCall(MamberCX, Ctor_Complete, LHS.getAddress(), 0, 0);
}
}
}
// Initialize the vtable pointer
if (ClassDecl->isDynamicClass()) {
if (!LoadOfThis)

24
clang/test/CodeGenCXX/default-constructor-for-members.cpp Normal file
View File

@ -0,0 +1,24 @@
// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s &&
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s &&
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
// RUN: true
extern "C" int printf(...);
struct S {
S() { printf("S::S()\n"); }
int iS;
};
struct M {
S ARR_S;
};
int main() {
M m1;
}
// CHECK-LP64: call __ZN1SC1Ev
// CHECK-LP32: call L__ZN1SC1Ev