diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-03-11 22:58:43 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-03-11 22:58:43 +0100 |
| commit | 4f150726cf236755158c3d895a31b4216336fae7 (patch) | |
| tree | 0b67df4f562bcc679f0b483d8037998b7b62cdad | |
| parent | 011acc898923f2511fc4ac2cbd21903cfe297a55 (diff) | |
| download | gcc-4f150726cf236755158c3d895a31b4216336fae7.zip gcc-4f150726cf236755158c3d895a31b4216336fae7.tar.gz gcc-4f150726cf236755158c3d895a31b4216336fae7.tar.bz2 | |
re PR middle-end/89655 (GCC crashes building linux kernel for arm 32-bit (culprit r269453))
PR middle-end/89655
PR bootstrap/89656
* vr-values.c (vr_values::update_value_range): If
old_vr->varying_p (), don't update it, make new_vr also VARYING
and return false.
* gcc.c-torture/compile/pr89655.c: New test.
From-SVN: r269597
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr89655.c | 15 | ||||
| -rw-r--r-- | gcc/vr-values.c | 9 |
4 files changed, 36 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2d08753..64bf601 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-03-11 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/89655 + PR bootstrap/89656 + * vr-values.c (vr_values::update_value_range): If + old_vr->varying_p (), don't update it, make new_vr also VARYING + and return false. + 2019-03-11 Martin Liska <mliska@suse.cz> * config/aarch64/aarch64.c (aarch64_override_options_internal): diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6ae2749..fdc7c40 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-03-11 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/89655 + PR bootstrap/89656 + * gcc.c-torture/compile/pr89655.c: New test. + 2019-03-11 Christophe Lyon <christophe.lyon@linaro.org> * gcc.target/arm/f16_f64_conv_no_dp.c: Add arm_fp16_ok effective diff --git a/gcc/testsuite/gcc.c-torture/compile/pr89655.c b/gcc/testsuite/gcc.c-torture/compile/pr89655.c new file mode 100644 index 0000000..f304c67 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr89655.c @@ -0,0 +1,15 @@ +/* PR middle-end/89655 */ + +int a, b, d; +char *c; + +void +foo (void) +{ + int f = a; + for (;;) + { + for (f = 0; f < (a > 3 ? : a); f++) + b = c[f] ? c[(f + 2 > a - 1 ? a - 1 : 2) * d] : 0; + } +} diff --git a/gcc/vr-values.c b/gcc/vr-values.c index a734ef9..0e10aca 100644 --- a/gcc/vr-values.c +++ b/gcc/vr-values.c @@ -189,8 +189,13 @@ vr_values::update_value_range (const_tree var, value_range *new_vr) because VR_RANGE and VR_ANTI_RANGE need to be considered the same. We may not have is_new when transitioning to UNDEFINED. If old_vr->type is VARYING, we shouldn't be - called. */ - if (new_vr->undefined_p ()) + called, if we are anyway, keep it VARYING. */ + if (old_vr->varying_p ()) + { + new_vr->set_varying (); + is_new = false; + } + else if (new_vr->undefined_p ()) { old_vr->set_varying (); new_vr->set_varying (); |