[cfe-commits] r95363 - in /cfe/trunk: lib/CodeGen/CGExprConstant.cpp test/CodeGenCXX/global-init.cpp

[Anders Carlsson]

Author: andersca
Date: Thu Feb  4 23:19:42 2010
New Revision: 95363

URL: http://llvm.org/viewvc/llvm-project?rev=95363&view=rev
Log:
If a global initializer has a non-trivial destructor it can't be emitted as a constant (even if it has a trivial constructor).

Modified:
    cfe/trunk/lib/CodeGen/CGExprConstant.cpp
    cfe/trunk/test/CodeGenCXX/global-init.cpp

Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=95363&r1=95362&r2=95363&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Thu Feb  4 23:19:42 2010
@@ -675,9 +675,18 @@
     if (!E->getConstructor()->isTrivial())
       return 0;
 
+    QualType Ty = 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");

Modified: cfe/trunk/test/CodeGenCXX/global-init.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/global-init.cpp?rev=95363&r1=95362&r2=95363&view=diff

==============================================================================
--- cfe/trunk/test/CodeGenCXX/global-init.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/global-init.cpp Thu Feb  4 23:19:42 2010
@@ -9,6 +9,8 @@
 
 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 @@
 // 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() {