diff options
| author | Richard Biener <rguenther@suse.de> | 2014-06-16 14:21:53 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-06-16 14:21:53 +0000 |
| commit | 9e9f6bf0079f1a8ff965efe7d971a1b636f36fbc (patch) | |
| tree | 2b9a194e46f795ad0e483a1a60c0cc9bd9306b5b | |
| parent | 7964957f618c2d0c8f024cf6135006dfe9d8c9b6 (diff) | |
| download | gcc-9e9f6bf0079f1a8ff965efe7d971a1b636f36fbc.zip gcc-9e9f6bf0079f1a8ff965efe7d971a1b636f36fbc.tar.gz gcc-9e9f6bf0079f1a8ff965efe7d971a1b636f36fbc.tar.bz2 | |
re PR tree-optimization/61482 (ICE in set_value_range, at tree-vrp.c:453 when compiling Firefox ESR 24)
2014-06-16 Richard Biener <rguenther@suse.de>
PR tree-optimization/61482
* tree-vrp.c (adjust_range_with_scev): Avoid setting of
[-INF(OVF), +INF(OVF)] range.
* g++.dg/torture/pr61482.C: New testcase.
From-SVN: r211709
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr61482.C | 29 | ||||
| -rw-r--r-- | gcc/tree-vrp.c | 29 |
4 files changed, 52 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 244d354..786ed0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-16 Richard Biener <rguenther@suse.de> + + PR tree-optimization/61482 + * tree-vrp.c (adjust_range_with_scev): Avoid setting of + [-INF(OVF), +INF(OVF)] range. + 2014-06-16 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com> * config/i386/i386.c (ix86_expand_sse2_mulvxdi3): Issue diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b417245..d6a3dd3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-16 Richard Biener <rguenther@suse.de> + + PR tree-optimization/61482 + * g++.dg/torture/pr61482.C: New testcase. + 2014-06-16 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com> * gcc.target/i386/xop-imul64-vector.c: Remove the check for diff --git a/gcc/testsuite/g++.dg/torture/pr61482.C b/gcc/testsuite/g++.dg/torture/pr61482.C new file mode 100644 index 0000000..1e186cc --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr61482.C @@ -0,0 +1,29 @@ +// { dg-do compile } + +class A +{ +public: + int m_fn1 (); +}; +class B +{ + void m_fn2 (const int &p1); + A mThebesLayerDataStack; +}; +int b, c; +void B::m_fn2 (const int &p1) +{ + if (c && b) + { + int i; + i = mThebesLayerDataStack.m_fn1 (); + for (; i >= 0;) + { + ++i; + break; + } + --i; + for (; i >= 0; --i) + mThebesLayerDataStack.m_fn1 (); + } +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 428e622..b657546 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -3892,15 +3892,6 @@ adjust_range_with_scev (value_range_t *vr, struct loop *loop, max = init; else min = init; - - /* If we would create an invalid range, then just assume we - know absolutely nothing. This may be over-conservative, - but it's clearly safe, and should happen only in unreachable - parts of code, or for invalid programs. */ - if (compare_values (min, max) == 1) - return; - - set_value_range (vr, VR_RANGE, min, max, vr->equiv); } else if (vr->type == VR_RANGE) { @@ -3933,16 +3924,20 @@ adjust_range_with_scev (value_range_t *vr, struct loop *loop, || compare_values (tmax, max) == -1) max = tmax; } + } + else + return; - /* If we just created an invalid range with the minimum - greater than the maximum, we fail conservatively. - This should happen only in unreachable - parts of code, or for invalid programs. */ - if (compare_values (min, max) == 1) - return; + /* If we just created an invalid range with the minimum + greater than the maximum, we fail conservatively. + This should happen only in unreachable + parts of code, or for invalid programs. */ + if (compare_values (min, max) == 1 + || (is_negative_overflow_infinity (min) + && is_positive_overflow_infinity (max))) + return; - set_value_range (vr, VR_RANGE, min, max, vr->equiv); - } + set_value_range (vr, VR_RANGE, min, max, vr->equiv); } |