From 74ac74ae244c501027924c99f2a33559a1e23b53 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 2 Mar 2009 04:58:03 +0000
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index b6b52cd8f7..558c940713 100644
--- 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>())
-- 
2.40.0