PR ada/24994

        * tree-cfg.c (bsi_replace): Remove the original statement
        from the EH throw statement table.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90d37de..b818536 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-04  Jeff Law  <law@redhat.com>
+
+       PR ada/24994
+       * tree-cfg.c (bsi_replace): Remove the original statement
+       from the EH throw statement table.
+
 2006-01-04  Jakub Jelinek  <jakub@redhat.com>
 
        * config/i386/pmm_malloc.h (posix_memalign): If __cplusplus,

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 31bfc39..2f45836 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2869,7 +2869,10 @@ bsi_replace (const block_stmt_iterator *bsi, tree stmt, bool preserve_eh_info)
     {
       eh_region = lookup_stmt_eh_region (orig_stmt);
       if (eh_region >= 0)
-       add_stmt_to_eh_region (stmt, eh_region);
+       {
+         remove_stmt_from_eh_region (stmt);
+         add_stmt_to_eh_region (stmt, eh_region);
+       }
     }
 
   delink_stmt_imm_use (orig_stmt);