tree-inline.c (fold_marked_statements): Update operand caches and EH after folding

	* tree-inline.c (fold_marked_statements): Update operand caches
	and EH after folding

From-SVN: r120477

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bcf02a4defa5e8da3eea55d271cfdd28c9a3821..4557a6fefb99b59c60545fc972f99c85daa0f023 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-04  Jan Hubicka  <jh@suse.cz>
+
+       * tree-inline.c (fold_marked_statements): Update operand caches
+       and EH after folding
+
 2007-01-04  Ian Lance Taylor  <iant@google.com>
 
        * c-common.c (check_function_nonnull): Whitespace fix.

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index bcfdd91b421d54d44fe7ab15b2e1a77fa89a82cc..b3fc03fda7b1c047d35c7f8b2e0d1cfdb562b8ed 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -2597,7 +2597,15 @@ fold_marked_statements (int first, struct pointer_set_t *statements)
        for (bsi = bsi_start (BASIC_BLOCK (first));
             !bsi_end_p (bsi); bsi_next (&bsi))
          if (pointer_set_contains (statements, bsi_stmt (bsi)))
-           fold_stmt (bsi_stmt_ptr (bsi));
+           {
+             tree old_stmt = bsi_stmt (bsi);
+             if (fold_stmt (bsi_stmt_ptr (bsi)))
+               {
+                 update_stmt (bsi_stmt (bsi));
+                 if (maybe_clean_or_replace_eh_stmt (old_stmt, bsi_stmt (bsi)))
+                    tree_purge_dead_eh_edges (BASIC_BLOCK (first));
+               }
+           }
       }
 }