aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2007-10-12 14:21:43 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2007-10-12 14:21:43 +0000
commit7cd13c1cad1f383d23dbd999b7f76b6db0c51c64 (patch)
tree636e64fecd4d0a4db7898531177e24b66f90b990 /gcc
parenta2085738a90651c26c26d7eb4300b9372bb62897 (diff)
downloadgcc-7cd13c1cad1f383d23dbd999b7f76b6db0c51c64.zip
gcc-7cd13c1cad1f383d23dbd999b7f76b6db0c51c64.tar.gz
gcc-7cd13c1cad1f383d23dbd999b7f76b6db0c51c64.tar.bz2
tree-ssa-forwprop.c (forward_propagate_into_cond): For combining both operands require either both have single uses or combining...
2007-10-12 Richard Guenther <rguenther@suse.de> * tree-ssa-forwprop.c (forward_propagate_into_cond): For combining both operands require either both have single uses or combining to a constant. From-SVN: r129261
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-ssa-forwprop.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 600d82d..9e7a02b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12 Richard Guenther <rguenther@suse.de>
+
+ * tree-ssa-forwprop.c (forward_propagate_into_cond): For
+ combining both operands require either both have single uses
+ or combining to a constant.
+
2007-10-12 Richard Guenther <rguenther@suse.de>
PR middle-end/26198
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index b92a9f1..047d057 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -360,7 +360,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
tree tmp = NULL_TREE;
tree cond = COND_EXPR_COND (cond_expr);
tree name, def_stmt, rhs0 = NULL_TREE, rhs1 = NULL_TREE;
- bool single_use_p;
+ bool single_use0_p = false, single_use1_p = false;
/* We can do tree combining on SSA_NAME and comparison expressions. */
if (COMPARISON_CLASS_P (cond)
@@ -369,7 +369,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
/* For comparisons use the first operand, that is likely to
simplify comparisons against constants. */
name = TREE_OPERAND (cond, 0);
- def_stmt = get_prop_source_stmt (name, false, &single_use_p);
+ def_stmt = get_prop_source_stmt (name, false, &single_use0_p);
if (def_stmt != NULL_TREE
&& can_propagate_from (def_stmt))
{
@@ -377,7 +377,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
rhs0 = GIMPLE_STMT_OPERAND (def_stmt, 1);
tmp = combine_cond_expr_cond (TREE_CODE (cond), boolean_type_node,
fold_convert (TREE_TYPE (op1), rhs0),
- op1, !single_use_p);
+ op1, !single_use0_p);
}
/* If that wasn't successful, try the second operand. */
if (tmp == NULL_TREE
@@ -385,7 +385,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
{
tree op0 = TREE_OPERAND (cond, 0);
name = TREE_OPERAND (cond, 1);
- def_stmt = get_prop_source_stmt (name, false, &single_use_p);
+ def_stmt = get_prop_source_stmt (name, false, &single_use1_p);
if (def_stmt == NULL_TREE
|| !can_propagate_from (def_stmt))
return did_something;
@@ -394,7 +394,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
tmp = combine_cond_expr_cond (TREE_CODE (cond), boolean_type_node,
op0,
fold_convert (TREE_TYPE (op0), rhs1),
- !single_use_p);
+ !single_use1_p);
}
/* If that wasn't successful either, try both operands. */
if (tmp == NULL_TREE
@@ -403,7 +403,7 @@ forward_propagate_into_cond (tree cond_expr, tree stmt)
tmp = combine_cond_expr_cond (TREE_CODE (cond), boolean_type_node,
rhs0,
fold_convert (TREE_TYPE (rhs0), rhs1),
- !single_use_p);
+ !(single_use0_p && single_use1_p));
}
else if (TREE_CODE (cond) == SSA_NAME)
{