From 47023d1a43e5b5a1f53d09d7b05aec5ac94e79ce Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Mon, 29 Nov 2004 01:15:39 +0000 Subject: [PATCH] PR/18662, also backported from tree-cleanup-branch. * tree-ssa-ccp.c (substitute_and_fold): If replaced anything, always call maybe_clean_eh_stmt and modify_stmt. Co-Authored-By: Diego Novillo From-SVN: r91451 --- gcc/ChangeLog | 7 +++++++ gcc/tree-ssa-ccp.c | 16 +++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6472431065d..9b2dba2458c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-11-28 Richard Kenner + Diego Novillo + + PR/18662, also backported from tree-cleanup-branch. + * tree-ssa-ccp.c (substitute_and_fold): If replaced anything, + always call maybe_clean_eh_stmt and modify_stmt. + 2004-11-28 Richard Kenner PR/18664 diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 911e57350ad..c530eded8c6 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -579,16 +579,18 @@ substitute_and_fold (void) { bool changed = fold_stmt (bsi_stmt_ptr (i)); stmt = bsi_stmt(i); + /* If we folded a builtin function, we'll likely need to rename VDEFs. */ if (replaced_address || changed) - { - mark_new_vars_to_rename (stmt, vars_to_rename); - if (maybe_clean_eh_stmt (stmt)) - tree_purge_dead_eh_edges (bb); - } - else - modify_stmt (stmt); + mark_new_vars_to_rename (stmt, vars_to_rename); + + /* If we cleaned up EH information from the statement, + remove EH edges. */ + if (maybe_clean_eh_stmt (stmt)) + tree_purge_dead_eh_edges (bb); + + modify_stmt (stmt); } if (dump_file && (dump_flags & TDF_DETAILS)) -- 2.30.2