commit 9ac0bbebb3eea9f15ddb75ad575f4cd717a73afa
author Bill Wendling <isanbard@gmail.com> Tue Sep 15 18:31:10 2009 +0000
committer Bill Wendling <isanbard@gmail.com> Tue Sep 15 18:31:10 2009 +0000
tree d28a9317177265d4533aa7d106bdb8b7e8133327
parent d634863418d1952c09cdcebf10110ca6a2742554

--- Reverse-merging r81440 into '.':
U    gcc/llvm-convert.cpp
U    gcc/except.c

Revert the test of Eric's patch.

llvm-svn: 81887

llvm-gcc-4.2/gcc/except.c

diff --git a/llvm-gcc-4.2/gcc/except.c b/llvm-gcc-4.2/gcc/except.c
index fa97fe7..af7c05c 100644
--- a/llvm-gcc-4.2/gcc/except.c
+++ b/llvm-gcc-4.2/gcc/except.c
@@ -4085,7 +4085,11 @@
      and even requires additional instructions on some targets. */
   const char *name = USING_SJLJ_EXCEPTIONS ?
                        "_Unwind_SjLj_Resume"
+#ifdef LLVM_STACKSENSITIVE_UNWIND_RESUME
+                       : "_Unwind_Resume_or_Rethrow";
+#else
                        : "_Unwind_Resume";
+#endif
   tree decl = build_decl (FUNCTION_DECL, get_identifier (name),
                           build_function_type_list (void_type_node,
                                                     ptr_type_node, NULL_TREE));

llvm-gcc-4.2/gcc/llvm-convert.cpp

diff --git a/llvm-gcc-4.2/gcc/llvm-convert.cpp b/llvm-gcc-4.2/gcc/llvm-convert.cpp
index 6101db1..d06a27c 100644
--- a/llvm-gcc-4.2/gcc/llvm-convert.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-convert.cpp
@@ -1905,12 +1905,32 @@
             Args.push_back(Emit(TType, 0));
           }
         }
-      } else {
-	// Cleanup region.
-	Args.push_back(ConstantInt::get(Type::Int32Ty, 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 *Catch_All;
+      if (!lang_eh_catch_all) {
+        // Use a "cleanup" - this should be good enough for most languages.
+        Catch_All = ConstantInt::get(Type::Int32Ty, 0);
+      } else {
+        tree catch_all_type = lang_eh_catch_all();
+        if (catch_all_type == NULL_TREE)
+          // Use a C++ style null catch-all object.
+          Catch_All =
+            Constant::getNullValue(PointerType::getUnqual(Type::Int8Ty));
+        else
+          // This language has a type that catches all others.
+          Catch_All = Emit(catch_all_type, 0);
+      }
+      Args.push_back(Catch_All);
+    }
+
     // Emit the selector call.
     Value *Select = Builder.CreateCall(FuncEHSelector, Args.begin(), Args.end(),
                                        "eh_select");
@@ -2043,7 +2063,11 @@
   if (UnwindBB) {
     CreateExceptionValues();
     EmitBlock(UnwindBB);
-    Builder.CreateUnwind();
+    // Fetch and store exception handler.
+    Value *Arg = Builder.CreateLoad(ExceptionValue, "eh_ptr");
+    assert(llvm_unwind_resume_libfunc && "no unwind resume function!");
+    Builder.CreateCall(DECL_LLVM(llvm_unwind_resume_libfunc), Arg);
+    Builder.CreateUnreachable();
   }
 }