[cfe-commits] r130233 - in /cfe/trunk: lib/CodeGen/CGException.cpp test/CodeGenObjC/simplify-exceptions.mm

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr 26 14:43:00 2011
New Revision: 130233

URL: http://llvm.org/viewvc/llvm-project?rev=130233&view=rev
Log:
IRgen/Darwin: Fix refacto introduced in Triple changes.

Added:
    cfe/trunk/test/CodeGenObjC/simplify-exceptions.mm
Modified:
    cfe/trunk/lib/CodeGen/CGException.cpp

Modified: cfe/trunk/lib/CodeGen/CGException.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGException.cpp?rev=130233&r1=130232&r2=130233&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGException.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGException.cpp Tue Apr 26 14:43:00 2011
@@ -266,7 +266,7 @@
 /// when it really needs it.
 void CodeGenModule::SimplifyPersonality() {
   // For now, this is really a Darwin-specific operation.
-  if (Context.Target.getTriple().isOSDarwin())
+  if (!Context.Target.getTriple().isOSDarwin())
     return;
 
   // If we're not in ObjC++ -fexceptions, there's nothing to do.

Added: cfe/trunk/test/CodeGenObjC/simplify-exceptions.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/simplify-exceptions.mm?rev=130233&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/simplify-exceptions.mm (added)
+++ cfe/trunk/test/CodeGenObjC/simplify-exceptions.mm Tue Apr 26 14:43:00 2011
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm \
+// RUN:   -fexceptions -fobjc-exceptions -fobjc-nonfragile-abi \
+// RUN:   -o %t %s
+// RUN: FileCheck < %t %s
+//
+// <rdar://problem/7471679> [irgen] [eh] Exception code built with clang (x86_64) crashes
+
+// Check that we don't emit unnecessary personality function references.
+struct t0_A { t0_A(); };
+struct t0_B { t0_A a; };
+
+// CHECK: define {{.*}} @_Z2t0v(){{.*}} {
+// CHECK-NOT: objc_personality
+// CHECK: }
+t0_B& t0() {
+ static t0_B x;
+ return x;
+}