[cfe-commits] r154653 - in /cfe/trunk: lib/CodeGen/CGDeclCXX.cpp test/CodeGenCXX/apple-kext.cpp

[John McCall]

Author: rjmccall
Date: Thu Apr 12 21:53:27 2012
New Revision: 154653

URL: http://llvm.org/viewvc/llvm-project?rev=154653&view=rev
Log:
Fix a trivial oversight with apple-kext static local destructors
and add a test case.

Added:
    cfe/trunk/test/CodeGenCXX/apple-kext.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGDeclCXX.cpp

Modified: cfe/trunk/lib/CodeGen/CGDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDeclCXX.cpp?rev=154653&r1=154652&r2=154653&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDeclCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDeclCXX.cpp Thu Apr 12 21:53:27 2012
@@ -244,6 +244,7 @@
   if (CGM.getContext().getLangOpts().AppleKext) {
     // Generate a global destructor entry.
     CGM.AddCXXDtorEntry(dtor, addr);
+    return;
   }
 
   // Otherwise, we just use atexit.

Added: cfe/trunk/test/CodeGenCXX/apple-kext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/apple-kext.cpp?rev=154653&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/apple-kext.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/apple-kext.cpp Thu Apr 12 21:53:27 2012
@@ -0,0 +1,22 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fno-use-cxa-atexit -fapple-kext -emit-llvm -o - %s | FileCheck %s
+
+// CHECK: @_ZN5test01aE = global [[A:%.*]] zeroinitializer
+// CHECK: @llvm.global_ctors = appending global {{.*}} { i32 65535, void ()* [[CTOR0:@.*]] }
+// CHECK: @llvm.global_dtors = appending global {{.*}} { i32 65535, void ()* [[DTOR0:@.*]] }
+
+// rdar://11241230
+namespace test0 {
+  struct A { A(); ~A(); };
+  A a;
+}
+// CHECK:    define internal void [[CTOR0_:@.*]]()
+// CHECK:      call void @_ZN5test01AC1Ev([[A]]* @_ZN5test01aE)
+// CHECK-NEXT: ret void
+
+// CHECK:    define internal void [[CTOR0]]()
+// CHECK:      call void [[CTOR0_]]()
+// CHECK-NEXT: ret void
+
+// CHECK:    define internal void [[DTOR0]]()
+// CHECK:      call void @_ZN5test01AD1Ev([[A]]* @_ZN5test01aE)
+// CHECK-NEXT: ret void