diff options
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 12 | ||||
| -rw-r--r-- | test/CodeGenCXX/global-init.cpp | 5 |
2 files changed, 1 insertions, 16 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index a2073e6673..a358b54fa3 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -675,19 +675,9 @@ public: if (!E->getConstructor()->isTrivial()) return 0; - // FIXME: We should not have to call getBaseElementType here. - QualType Ty = CGM.getContext().getBaseElementType(E->getType()); - - const CXXRecordDecl *RD = - cast<CXXRecordDecl>(Ty->getAs<RecordType>()->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 b60e056d70..fd8c159755 100644 --- a/test/CodeGenCXX/global-init.cpp +++ b/test/CodeGenCXX/global-init.cpp @@ -9,8 +9,6 @@ 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) @@ -25,7 +23,4 @@ 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() { |