diff options
| author | Aldy Hernandez <aldyh@redhat.com> | 2018-09-12 07:04:19 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2018-09-12 07:04:19 +0000 |
| commit | 28aa63232068fa0adb8911b1987ff9efa0101750 (patch) | |
| tree | 8f15a200648baa936a0018cd2c49ea033a8358e7 /gcc | |
| parent | bb753cad995b2a0f98a566cc710feef45e1b46b3 (diff) | |
| download | gcc-28aa63232068fa0adb8911b1987ff9efa0101750.zip gcc-28aa63232068fa0adb8911b1987ff9efa0101750.tar.gz gcc-28aa63232068fa0adb8911b1987ff9efa0101750.tar.bz2 | |
tree-vrp.c (vrp_shift_undefined_p): Remove.
* tree-vrp.c (vrp_shift_undefined_p): Remove.
(extract_range_from_binary_expr_1: Call
wide_int_range_shift_undefined_p instead of vrp_shift_undefined_p.
* wide-int-range.h (wide_int_range_shift_undefined_p): Do not
depend on sign.
From-SVN: r264228
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/tree-vrp.c | 15 | ||||
| -rw-r--r-- | gcc/wide-int-range.h | 4 |
3 files changed, 13 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5468ca..e3ed707 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2018-09-12 Aldy Hernandez <aldyh@redhat.com> + * tree-vrp.c (vrp_shift_undefined_p): Remove. + (extract_range_from_binary_expr_1: Call + wide_int_range_shift_undefined_p instead of vrp_shift_undefined_p. + * wide-int-range.h (wide_int_range_shift_undefined_p): Do not + depend on sign. + +2018-09-12 Aldy Hernandez <aldyh@redhat.com> + * gimple-ssa-warn-alloca.c (alloca_type_and_limit::alloca_type_and_limit): Initialize limit field for ALLOCA_BOUND_*_LARGE. diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index a82cf3e..d26011a 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -1018,17 +1018,6 @@ extract_range_into_wide_ints (const value_range *vr, } } -/* Value range wrapper for wide_int_range_shift_undefined_p. */ - -static inline bool -vrp_shift_undefined_p (const value_range &shifter, unsigned prec) -{ - tree type = TREE_TYPE (shifter.min); - return wide_int_range_shift_undefined_p (TYPE_SIGN (type), prec, - wi::to_wide (shifter.min), - wi::to_wide (shifter.max)); -} - /* Value range wrapper for wide_int_range_multiplicative_op: *VR = *VR0 .CODE. *VR1. */ @@ -1549,7 +1538,9 @@ extract_range_from_binary_expr_1 (value_range *vr, || code == LSHIFT_EXPR) { if (range_int_cst_p (&vr1) - && !vrp_shift_undefined_p (vr1, prec)) + && !wide_int_range_shift_undefined_p (prec, + wi::to_wide (vr1.min), + wi::to_wide (vr1.max))) { if (code == RSHIFT_EXPR) { diff --git a/gcc/wide-int-range.h b/gcc/wide-int-range.h index 589fdea..e9ee418 100644 --- a/gcc/wide-int-range.h +++ b/gcc/wide-int-range.h @@ -131,7 +131,7 @@ extern bool wide_int_range_div (wide_int &wmin, wide_int &wmax, /* Return TRUE if shifting by range [MIN, MAX] is undefined behavior. */ inline bool -wide_int_range_shift_undefined_p (signop sign, unsigned prec, +wide_int_range_shift_undefined_p (unsigned prec, const wide_int &min, const wide_int &max) { /* ?? Note: The original comment said this only applied to @@ -142,7 +142,7 @@ wide_int_range_shift_undefined_p (signop sign, unsigned prec, behavior from the shift operation. We cannot even trust SHIFT_COUNT_TRUNCATED at this stage, because that applies to rtl shifts, and the operation at the tree level may be widened. */ - return wi::lt_p (min, 0, sign) || wi::ge_p (max, prec, sign); + return wi::sign_mask (min) || wi::ge_p (max, prec, UNSIGNED); } /* Calculate MIN/MAX_EXPR of two ranges and store the result in [MIN, MAX]. */ |