diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-02-05 18:38:45 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-02-05 18:38:45 +0000 |
| commit | 2ca4f633b21c65e1a4edc2405a768d7f5db564eb (patch) | |
| tree | b603c77d74a911231108bc2d06b4af97bfbe3fb0 | |
| parent | 16c4f3c7d44289e30f5066dce7ce9efe7ff67bbc (diff) | |
Fix the bug that was breaking self-host, and re-land the static ctor fixes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95400 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 13 | ||||
| -rw-r--r-- | test/CodeGenCXX/global-init.cpp | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index a358b54fa3..dca09feebc 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -675,9 +675,20 @@ public: if (!E->getConstructor()->isTrivial()) return 0; + QualType Ty = E->getType(); + + // FIXME: We should not have to call getBaseElementType here. + const RecordType *RT = + CGM.getContext().getBaseElementType(Ty)->getAs<RecordType>(); + const CXXRecordDecl *RD = cast<CXXRecordDecl>(RT->getDecl()); + + // If the class doesn't have a trivial destructor, we can't emit it as a + // constant expr. + if (!RD->hasTrivialDestructor()) + return 0; + // Only copy and default constructors can be trivial. - QualType Ty = E->getType(); if (E->getNumArgs()) { assert(E->getNumArgs() == 1 && "trivial ctor with > 1 argument"); diff --git a/test/CodeGenCXX/global-init.cpp b/test/CodeGenCXX/global-init.cpp index fd8c159755..b60e056d70 100644 --- a/test/CodeGenCXX/global-init.cpp +++ b/test/CodeGenCXX/global-init.cpp @@ -9,6 +9,8 @@ struct B { B(); ~B(); }; struct C { void *field; }; +struct D { ~D(); }; + // CHECK: @c = global %struct.C zeroinitializer, align 8 // CHECK: call void @_ZN1AC1Ev(%struct.A* @a) @@ -23,4 +25,7 @@ B b; // CHECK-NOT: call void @_ZN1CC1Ev(%struct.C* @c) C c; +// CHECK: call i32 @__cxa_atexit(void (i8*)* bitcast (void (%struct.A*)* @_ZN1DD1Ev to void (i8*)*), i8* getelementptr inbounds (%struct.A* @d, i32 0, i32 0), i8* bitcast (i8** @__dso_handle to i8*)) +D d; + // CHECK: define internal void @__cxx_global_initialization() { |