diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
| commit | c9c81ef3c667aaa14c498a5449ec6d134b4b66ff (patch) | |
| tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /gcc/tree-vrp.c | |
| parent | 12cdcb9d74f55c165366ca1b1eeec013a0ce72ef (diff) | |
| parent | 891196d7325e4c55d92d5ac5cfe7161c4f36c0ce (diff) | |
| download | gcc-fortran-dev.tar.gz | |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-vrp.c')
| -rw-r--r-- | gcc/tree-vrp.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 45882c438ba..e7067ab8e6e 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -744,23 +744,29 @@ update_value_range (const_tree var, value_range *new_vr) value_range_type rtype = get_range_info (var, &min, &max); if (rtype == VR_RANGE || rtype == VR_ANTI_RANGE) { - value_range nr; - nr.type = rtype; + tree nr_min, nr_max; /* Range info on SSA names doesn't carry overflow information so make sure to preserve the overflow bit on the lattice. */ - if (new_vr->type == VR_RANGE - && is_negative_overflow_infinity (new_vr->min) - && wi::eq_p (new_vr->min, min)) - nr.min = new_vr->min; + if (rtype == VR_RANGE + && needs_overflow_infinity (TREE_TYPE (var)) + && (new_vr->type == VR_VARYING + || (new_vr->type == VR_RANGE + && is_negative_overflow_infinity (new_vr->min))) + && wi::eq_p (vrp_val_min (TREE_TYPE (var)), min)) + nr_min = negative_overflow_infinity (TREE_TYPE (var)); else - nr.min = wide_int_to_tree (TREE_TYPE (var), min); - if (new_vr->type == VR_RANGE - && is_positive_overflow_infinity (new_vr->max) - && wi::eq_p (new_vr->max, max)) - nr.max = new_vr->max; + nr_min = wide_int_to_tree (TREE_TYPE (var), min); + if (rtype == VR_RANGE + && needs_overflow_infinity (TREE_TYPE (var)) + && (new_vr->type == VR_VARYING + || (new_vr->type == VR_RANGE + && is_positive_overflow_infinity (new_vr->max))) + && wi::eq_p (vrp_val_max (TREE_TYPE (var)), max)) + nr_max = positive_overflow_infinity (TREE_TYPE (var)); else - nr.max = wide_int_to_tree (TREE_TYPE (var), max); - nr.equiv = NULL; + nr_max = wide_int_to_tree (TREE_TYPE (var), max); + value_range nr = VR_INITIALIZER; + set_and_canonicalize_value_range (&nr, rtype, nr_min, nr_max, NULL); vrp_intersect_ranges (new_vr, &nr); } } |