diff options
| author | Richard Biener <rguenth@gcc.gnu.org> | 2007-06-06 13:58:41 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2007-06-06 13:58:41 +0000 |
| commit | 68c834d087355b52387e37a5c87436153b638b05 (patch) | |
| tree | f0957cdcca67da1826ca1fe5ed55eaeb8d988fef | |
| parent | 5a59ef36873d2b7cfd32cb70f3e04c6b1279569e (diff) | |
| download | gcc-68c834d087355b52387e37a5c87436153b638b05.zip gcc-68c834d087355b52387e37a5c87436153b638b05.tar.gz gcc-68c834d087355b52387e37a5c87436153b638b05.tar.bz2 | |
tree-ssa-forwprop.c (forward_propagate_into_cond): Return 2 if we need to schedule cfg_cleanup.
2007-06-06 Richard Guenther <rguenther@suse.de>
* tree-ssa-forwprop.c (forward_propagate_into_cond): Return 2
if we need to schedule cfg_cleanup.
(tree_ssa_forward_propagate_single_use_vars): Do so.
From-SVN: r125490
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/tree-ssa-forwprop.c | 21 |
2 files changed, 22 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e775c3..b2daf37 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-06-06 Richard Guenther <rguenther@suse.de> + + * tree-ssa-forwprop.c (forward_propagate_into_cond): Return 2 + if we need to schedule cfg_cleanup. + (tree_ssa_forward_propagate_single_use_vars): Do so. + 2007-06-06 Ian Lance Taylor <iant@google.com> * fold-const.c (merge_ranges): If range_successor or @@ -247,7 +253,7 @@ PR target/31733 * cfgrtl.c (rtl_verify_flow_info): Skip notes when looking for barrier. -2007-05-31 Jan Hubicka <jh@suse.cz> +2007-06-04 Jan Hubicka <jh@suse.cz> * tree-predcom.c (replace_ref_with, initialize_root_vars_lm, reassociate_to_the_same_stmt): Call build_gimple_modify_stmt diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index e42406c..967a824 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -370,12 +370,14 @@ combine_cond_expr_cond (enum tree_code code, tree type, } /* Propagate from the ssa name definition statements of COND_EXPR - in statement STMT into the conditional if that simplifies it. */ + in statement STMT into the conditional if that simplifies it. + Returns zero if no statement was changed, one if there were + changes and two if cfg_cleanup needs to run. */ -static bool +static int forward_propagate_into_cond (tree cond_expr, tree stmt) { - bool did_something = false; + int did_something = 0; do { tree tmp = NULL_TREE; @@ -449,7 +451,10 @@ forward_propagate_into_cond (tree cond_expr, tree stmt) /* Remove defining statements. */ remove_prop_source_from_use (name, NULL); - did_something = true; + if (is_gimple_min_invariant (tmp)) + did_something = 2; + else if (did_something == 0) + did_something = 1; /* Continue combining. */ continue; @@ -1014,9 +1019,11 @@ tree_ssa_forward_propagate_single_use_vars (void) } else if (TREE_CODE (rhs) == COND_EXPR) { - bool did_something; + int did_something; fold_defer_overflow_warnings (); did_something = forward_propagate_into_cond (rhs, stmt); + if (did_something == 2) + cfg_changed = true; fold_undefer_overflow_warnings (!TREE_NO_WARNING (rhs) && did_something, stmt, WARN_STRICT_OVERFLOW_CONDITIONAL); bsi_next (&bsi); @@ -1042,9 +1049,11 @@ tree_ssa_forward_propagate_single_use_vars (void) } else if (TREE_CODE (stmt) == COND_EXPR) { - bool did_something; + int did_something; fold_defer_overflow_warnings (); did_something = forward_propagate_into_cond (stmt, stmt); + if (did_something == 2) + cfg_changed = true; fold_undefer_overflow_warnings (!TREE_NO_WARNING (stmt) && did_something, stmt, WARN_STRICT_OVERFLOW_CONDITIONAL); |