commit a47bb8e72bf8dd379d521ba8bb106f64411b6964
author Daniel Dunbar <daniel@zuster.org> Mon Mar 02 04:58:03 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Mon Mar 02 04:58:03 2009 +0000
tree 70d62b0aef1ccfa73565e87934dd3e000660d611
parent 90e4345ffa4354d81b54d60d3597f5d1aeddd3f6

Don't set nounwind on functions when in using the new Obj-C ABI.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65806 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CodeGenModule.cpp

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index b6b52cd..558c940 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -334,7 +334,7 @@
                              FD->isInline(), F, true);
   }
                              
-  if (!Features.Exceptions)
+  if (!Features.Exceptions && !Features.ObjCNonFragileABI)
     F->addFnAttr(llvm::Attribute::NoUnwind);  
 
   if (D->getAttr<AlwaysInlineAttr>())