commit 0f3403cb5accaa69386e0caa49f9d30ecd3328f6
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 e9fa689a7f10bf5441ac4640e833469d18f8975e
parent b960b7b7c7d7a79124f83fc720b9b7981d5d07dd

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

llvm-svn: 65806

clang/lib/CodeGen/CodeGenModule.cpp

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index b6b52cd..558c940 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/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>())