[llvm-commits] [llvm-gcc-4.2] r80850 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc: except.c llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Wed Sep  2 18:23:37 2009
New Revision: 80850

URL: http://llvm.org/viewvc/llvm-project?rev=80850&view=rev
Log:
Apply Eric's experimental patch for <rdar://problem/7151726> for the SWB.

Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/except.c
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/except.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/except.c?rev=80850&r1=80849&r2=80850&view=diff

==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/except.c (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/except.c Wed Sep  2 18:23:37 2009
@@ -4085,7 +4085,7 @@
      and even requires additional instructions on some targets. */
   const char *name = USING_SJLJ_EXCEPTIONS ?
                        "_Unwind_SjLj_Resume"
-                       : "_Unwind_Resume_or_Rethrow";
+                       : "_Unwind_Resume";
   tree decl = build_decl (FUNCTION_DECL, get_identifier (name),
                           build_function_type_list (void_type_node,
                                                     ptr_type_node, NULL_TREE));

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/llvm-convert.cpp?rev=80850&r1=80849&r2=80850&view=diff

==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2306/gcc/llvm-convert.cpp Wed Sep  2 18:23:37 2009
@@ -1998,30 +1998,10 @@
             Args.push_back(Emit(TType, 0));
           }
         }
-      }
-    }
-
-    if (can_throw_external_1(i, false)) {
-      // Some exceptions from this region may not be caught by any handler.
-      // Since invokes are required to branch to the unwind label no matter
-      // what exception is being unwound, append a catch-all.
-
-      // The representation of a catch-all is language specific.
-      Value *CatchAll;
-      if (USING_SJLJ_EXCEPTIONS || !lang_eh_catch_all) {
-        // Use a "cleanup" - this should be good enough for most languages.
-        CatchAll = ConstantInt::get(Type::getInt32Ty(Context), 0);
       } else {
-        tree catch_all_type = lang_eh_catch_all();
-        if (catch_all_type == NULL_TREE)
-          // Use a C++ style null catch-all object.
-          CatchAll = Constant::getNullValue(
-                                    PointerType::getUnqual(Type::getInt8Ty(Context)));
-        else
-          // This language has a type that catches all others.
-          CatchAll = Emit(catch_all_type, 0);
+	// Cleanup region.
+	Args.push_back(ConstantInt::get(Type::getInt32Ty(Context), 0));
       }
-      Args.push_back(CatchAll);
     }
 
     // Emit the selector call.