From: Jeff Law <law@redhat.com>
Date: Wed, 4 Jan 2006 16:29:32 +0000 (-0700)
Subject: re PR ada/24994 (raised STORAGE_ERROR : stack overflow or erroneous memory access)
X-Git-Tag: releases/gcc-4.2.0~5043
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59bb84ef39a86a30c2f0280eb2176ee73a9e4cb9;p=thirdparty%2Fgcc.git

re PR ada/24994 (raised STORAGE_ERROR : stack overflow or erroneous memory access)

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

From-SVN: r109335
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90d37de683d3..b818536ad29a 100644
--- 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 31bfc39dbce5..2f4583600f79 100644
--- 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);