From 53cb6378dfbe32638607251ac2469919eee86df1 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 21 Sep 2017 10:53:40 +0000 Subject: [PATCH] Add missing int_cst_rangeN checks to tree-vrp.c The BIT_AND_EXPR handling in extract_range_from_binary_expr_1 was using value_range_constant_singleton without first checking whether the range was a constant. The earlier handling was correctly guarded: /* If either input range contains only non-negative values we can truncate the result range maximum to the respective maximum of the input range. */ if (int_cst_range0 && tree_int_cst_sgn (vr0.min) >= 0) wmax = wi::min (wmax, vr0.max, TYPE_SIGN (expr_type)); if (int_cst_range1 && tree_int_cst_sgn (vr1.min) >= 0) wmax = wi::min (wmax, vr1.max, TYPE_SIGN (expr_type)); so this patch uses the same guards again. Existing tests showed the need for this once polynomial constants are added. 2017-09-21 Richard Sandiford Alan Hayward David Sherwood gcc/ * tree-vrp.c (extract_range_from_binary_expr_1): Check int_cst_rangeN before calling value_range_constant_singleton (&vrN). Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r253054 --- gcc/ChangeLog | 7 +++++++ gcc/tree-vrp.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80803d62294..3861e6603e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-09-21 Richard Sandiford + Alan Hayward + David Sherwood + + * tree-vrp.c (extract_range_from_binary_expr_1): Check + int_cst_rangeN before calling value_range_constant_singleton (&vrN). + 2017-09-21 Richard Biener PR tree-optimization/71351 diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 221a07b6b3f..1d45851ea92 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -2930,9 +2930,11 @@ extract_range_from_binary_expr_1 (value_range *vr, = wi::set_bit_in_zero (TYPE_PRECISION (expr_type) - 1, TYPE_PRECISION (expr_type)); if (!TYPE_UNSIGNED (expr_type) - && ((value_range_constant_singleton (&vr0) + && ((int_cst_range0 + && value_range_constant_singleton (&vr0) && !wi::cmps (vr0.min, sign_bit)) - || (value_range_constant_singleton (&vr1) + || (int_cst_range1 + && value_range_constant_singleton (&vr1) && !wi::cmps (vr1.min, sign_bit)))) { min = TYPE_MIN_VALUE (expr_type); -- 2.30.2