re PR tree-optimization/19505 (java bytecode to native ICE in remove_unreachable_regions)

2006-07-13  Andrew Haley  <aph@redhat.com>

        PR tree-optimization/19505
        * tree-cfgcleanup.c (tree_forwarder_block_p): If we have an EH
        edge leaving this block, make sure that the destination of this
        block has only one predecessor.

From-SVN: r115518

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c6048b7e0900d5ff0f707fc410b9604764bd840..0ff6fa371435cd48ffe86a060ecf0d62e8a567c0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-13  Andrew Haley  <aph@redhat.com>
+
+       PR tree-optimization/19505
+       * tree-cfgcleanup.c (tree_forwarder_block_p): If we have an EH
+       edge leaving this block, make sure that the destination of this
+       block has only one predecessor.
+
 2006-07-17  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/28238

diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index ab452c4af5a3afb96efc9c10c71c0c5f413806ec..be90209d3be65ad1a7cf521d334ca9ea0fd4bfb3 100644 (file)
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -239,6 +239,9 @@ static bool
 tree_forwarder_block_p (basic_block bb, bool phi_wanted)
 {
   block_stmt_iterator bsi;
+  edge_iterator ei;
+  edge e, succ;
+  basic_block dest;
 
   /* BB must have a single outgoing edge.  */
   if (single_succ_p (bb) != 1
@@ -290,6 +293,22 @@ tree_forwarder_block_p (basic_block bb, bool phi_wanted)
        return false;
     }
 
+  /* If we have an EH edge leaving this block, make sure that the
+     destination of this block has only one predecessor.  This ensures
+     that we don't get into the situation where we try to remove two
+     forwarders that go to the same basic block but are handlers for
+     different EH regions.  */
+  succ = single_succ_edge (bb);
+  dest = succ->dest;
+  FOR_EACH_EDGE (e, ei, bb->preds)
+    {
+      if (e->flags & EDGE_EH)
+        {
+         if (!single_pred_p (dest))
+           return false;
+       }
+    }
+
   return true;
 }