[llvm-commits] [gcc-plugin] r75347 - /gcc-plugin/trunk/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Jul 10 23:08:47 2009
New Revision: 75347

URL: http://llvm.org/viewvc/llvm-project?rev=75347&view=rev
Log:
Likewise, can_throw_external_1 and can_throw_internal_1
now have a parameter for inlinability.  Pass "false"
always.

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

Modified: gcc-plugin/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-convert.cpp?rev=75347&r1=75346&r2=75347&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-convert.cpp (original)
+++ gcc-plugin/trunk/llvm-convert.cpp Fri Jul 10 23:08:47 2009
@@ -1983,7 +1983,7 @@
       }
     }
 
-    if (can_throw_external_1(i, false)) {
+    if (can_throw_external_1(i, false, 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.
@@ -2121,7 +2121,7 @@
     if (TargetBB) {
       Builder.CreateBr(TargetBB);
     } else {
-      assert(can_throw_external_1(i, true) &&
+      assert(can_throw_external_1(i, true, false) &&
              "Must-not-throw region handled by runtime?");
       // Unwinding continues in the caller.
       if (!UnwindBB)
@@ -2610,7 +2610,7 @@
     // Is the call contained in an exception handling region?
     if (RegionNo > 0) {
       // Are there any exception handlers for this region?
-      if (can_throw_internal_1(RegionNo, false)) {
+      if (can_throw_internal_1(RegionNo, false, false)) {
         // There are - turn the call into an invoke.
         LandingPads.grow(RegionNo);
         BasicBlock *&ThisPad = LandingPads[RegionNo];
@@ -2621,7 +2621,7 @@
 
         LandingPad = ThisPad;
       } else {
-        assert(can_throw_external_1(RegionNo, false) &&
+        assert(can_throw_external_1(RegionNo, false, false) &&
                "Must-not-throw region handled by runtime?");
       }
     }
@@ -3754,7 +3754,7 @@
 
     Builder.CreateBr(getPostPad(get_eh_region_number(*Handlers.begin())));
   } else {
-    assert(can_throw_external_1(RegionNo, true) &&
+    assert(can_throw_external_1(RegionNo, true, false) &&
            "Must-not-throw region handled by runtime?");
     // Unwinding continues in the caller.
     if (!UnwindBB)