cfgrtl.c (rtl_merge_blocks): Call maybe_remove_eh_handler on labels we want to delete.

        * cfgrtl.c (rtl_merge_blocks): Call maybe_remove_eh_handler on
        labels we want to delete.
        (cfg_layout_merge_blocks): Likewise.

From-SVN: r102512

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46d1a4d33064ad4143acfd0684c9fe4f2eca1038..495a756ea2a3c53fa98f61997bade83434c2b883 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-28  Richard Henderson  <rth@redhat.com>
+
+       * cfgrtl.c (rtl_merge_blocks): Call maybe_remove_eh_handler on
+       labels we want to delete.
+       (cfg_layout_merge_blocks): Likewise.
+
 2005-07-28  Richard Henderson  <rth@redhat.com>
 
        PR target/17692

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 30290d4902ca8a56b05666e9b75d96eba82d2ea4..e39b196be07ca520f933ec98177d0cf4f0591b94 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -539,6 +539,10 @@ rtl_merge_blocks (basic_block a, basic_block b)
   /* If there was a CODE_LABEL beginning B, delete it.  */
   if (LABEL_P (b_head))
     {
+      /* This might have been an EH label that no longer has incoming
+        EH edges.  Update data structures to match.  */
+      maybe_remove_eh_handler (b_head);
+ 
       /* Detect basic blocks with nothing but a label.  This can happen
         in particular at the end of a function.  */
       if (b_head == b_end)
@@ -2733,7 +2737,13 @@ cfg_layout_merge_blocks (basic_block a, basic_block b)
 
   /* If there was a CODE_LABEL beginning B, delete it.  */
   if (LABEL_P (BB_HEAD (b)))
-    delete_insn (BB_HEAD (b));
+    {
+      /* This might have been an EH label that no longer has incoming
+        EH edges.  Update data structures to match.  */
+      maybe_remove_eh_handler (BB_HEAD (b));
+ 
+      delete_insn (BB_HEAD (b));
+    }
 
   /* We should have fallthru edge in a, or we can do dummy redirection to get
      it cleaned up.  */