aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-ssa-forwprop.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c8825d..f1d9799a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-20 Richard Guenther <rguenther@suse.de>
+
+ PR tree-optimization/53050
+ * tree-ssa-forwprop.c (ssa_forward_propagate_and_combine):
+ Do only one transform on COND_EXPRs at the same time.
+
2012-04-19 Jan Hubicka <jh@suse.cz>
* symtab.c (dump_symtab_base): Revert accidental checkin.
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 3e2371b..965f441 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -2536,9 +2536,12 @@ ssa_forward_propagate_and_combine (void)
|| code == VEC_COND_EXPR)
{
/* In this case the entire COND_EXPR is in rhs1. */
- changed |= forward_propagate_into_cond (&gsi);
- changed |= combine_cond_exprs (&gsi);
- stmt = gsi_stmt (gsi);
+ if (forward_propagate_into_cond (&gsi)
+ || combine_cond_exprs (&gsi))
+ {
+ changed = true;
+ stmt = gsi_stmt (gsi);
+ }
}
else if (TREE_CODE_CLASS (code) == tcc_comparison)
{