OSDN Git Service

2006-07-13 Andrew Haley <aph@redhat.com>
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 17 Jul 2006 13:14:38 +0000 (13:14 +0000)
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 17 Jul 2006 13:14:38 +0000 (13:14 +0000)
        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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115518 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/tree-cfgcleanup.c

index 8c6048b..0ff6fa3 100644 (file)
@@ -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
index ab452c4..be90209 100644 (file)
@@ -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;
 }