[llvm-commits] [llvm-gcc-4.2] r102321 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Sun Apr 25 18:14:23 2010
New Revision: 102321

URL: http://llvm.org/viewvc/llvm-project?rev=102321&view=rev
Log:
Use flag_objc_abi to indicate if we remove "noreturn" from objc_exception_throw
instead of TARGET_64BIT, which doesn't work for all platforms.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=102321&r1=102320&r2=102321&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Sun Apr 25 18:14:23 2010
@@ -2565,10 +2565,7 @@
       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 (
-#ifdef TARGET_64BIT
-        !TARGET_64BIT &&
-#endif
+    if (flag_objc_abi == 1 && 
         Callee->getName() == "objc_exception_throw")
       cast<Function>(Callee)->removeFnAttr(Attribute::NoReturn);
     else {
@@ -3009,10 +3006,7 @@
       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 (
-#ifdef TARGET_64BIT
-        !TARGET_64BIT &&
-#endif
+    if (flag_objc_abi == 1 && 
         Callee->getName() == "objc_exception_throw")
       cast<CallInst>(Call)->removeAttribute(~0U, Attribute::NoReturn);
     // LLVM LOCAL - end radar 7885482