[cfe-commits] r65806 - /cfe/trunk/lib/CodeGen/CodeGenModule.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sun Mar  1 22:58:03 2009
New Revision: 65806

URL: http://llvm.org/viewvc/llvm-project?rev=65806&view=rev
Log:
Don't set nounwind on functions when in using the new Obj-C ABI.

Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=65806&r1=65805&r2=65806&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Sun Mar  1 22:58:03 2009
@@ -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>())