[llvm-branch-commits] [llvm-gcc-branch] r102322 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Sun Apr 25 18:16:33 2010
New Revision: 102322

URL: http://llvm.org/viewvc/llvm-project?rev=102322&view=rev
Log:
Merge r102321 into Morbo.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp?rev=102322&r1=102321&r2=102322&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp Sun Apr 25 18:16:33 2010
@@ -2565,7 +2565,8 @@
       manner to the invoke/DWARF method. That is remove the "NORETURN"
       attribute, allowing it to have an edge from the call to the @finally
       block.  */
-    if (!TARGET_64BIT && Callee->getName() == "objc_exception_throw")
+    if (flag_objc_abi == 1 && 
+        Callee->getName() == "objc_exception_throw")
       cast<Function>(Callee)->removeFnAttr(Attribute::NoReturn);
     else {
       Builder.CreateUnreachable();
@@ -3005,7 +3006,8 @@
       manner to the invoke/DWARF method. That is remove the "NORETURN"
       attribute, allowing it to have an edge from the call to the @finally
       block.  */
-    if (!TARGET_64BIT && Callee->getName() == "objc_exception_throw")
+    if (flag_objc_abi == 1 && 
+        Callee->getName() == "objc_exception_throw")
       cast<CallInst>(Call)->removeAttribute(~0U, Attribute::NoReturn);
     // LLVM LOCAL - end radar 7885482
   } else {