aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-vrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/tree-vrp.c')
-rw-r--r--gcc/tree-vrp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 17fbcdb..7579ee1 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -2058,10 +2058,13 @@ extract_range_from_binary_expr (value_range_t *vr,
&& code != TRUTH_OR_EXPR)
{
/* We can still do constant propagation here. */
- if ((op0 = op_with_constant_singleton_value_range (op0)) != NULL_TREE
- && (op1 = op_with_constant_singleton_value_range (op1)) != NULL_TREE)
+ tree const_op0 = op_with_constant_singleton_value_range (op0);
+ tree const_op1 = op_with_constant_singleton_value_range (op1);
+ if (const_op0 || const_op1)
{
- tree tem = fold_binary (code, expr_type, op0, op1);
+ tree tem = fold_binary (code, expr_type,
+ const_op0 ? const_op0 : op0,
+ const_op1 ? const_op1 : op1);
if (tem
&& is_gimple_min_invariant (tem)
&& !is_overflow_infinity (tem))