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

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