From e82d7e604b1f422979641eae89fcc9a04280dd58 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Sat, 1 Oct 2005 14:00:09 +0000 Subject: [PATCH] re PR tree-optimization/24141 (VRP ICE in compare_name_with_value, at tree-vrp.c:2965) PR 24141 * tree-vrp.c (vrp_meet): Clear VR0->EQUIV when building a non-null range as a last resort. testsuite/ PR 24141 * gcc.c-torture/execute/pr24141.c: New test. From-SVN: r104859 --- gcc/ChangeLog | 6 ++++ gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gcc.c-torture/execute/pr24141.c | 33 +++++++++++++++++++ gcc/tree-vrp.c | 9 ++++- 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr24141.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95db709fc39..2971178cb4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-10-01 Diego Novillo + + PR 24141 + * tree-vrp.c (vrp_meet): Clear VR0->EQUIV when building a + non-null range as a last resort. + 2005-10-01 James A. Morrison Diego Novillo diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aff2b8d92cb..d90b90b069d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-10-01 Diego Novillo + + PR 24141 + * gcc.c-torture/execute/pr24141.c: New test. + 2005-10-01 James A. Morrison Diego Novillo diff --git a/gcc/testsuite/gcc.c-torture/execute/pr24141.c b/gcc/testsuite/gcc.c-torture/execute/pr24141.c new file mode 100644 index 00000000000..301296206cb --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr24141.c @@ -0,0 +1,33 @@ +// reduced testcase, compile with -O2. Also, with --disable-checking +// gcc produces wrong code. + +void abort (void); +int i; + +void g (void) +{ + i = 1; +} + +void f (int a, int b) +{ + int c = 0; + if (a == 0) + c = 1; + if (c) + return; + if (c == 1) + c = 0; + if (b == 0) + c = 1; + if (c) + g (); +} + +int main (void) +{ + f (1, 0); + if (i != 1) + abort (); + return 0; +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 21e6cf6d100..0e5ea09b5d5 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -3439,7 +3439,14 @@ no_meet: && !range_includes_zero_p (vr0) && !symbolic_range_p (vr1) && !range_includes_zero_p (vr1)) - set_value_range_to_nonnull (vr0, TREE_TYPE (vr0->min)); + { + set_value_range_to_nonnull (vr0, TREE_TYPE (vr0->min)); + + /* Since this meet operation did not result from the meeting of + two equivalent names, VR0 cannot have any equivalences. */ + if (vr0->equiv) + bitmap_clear (vr0->equiv); + } else set_value_range_to_varying (vr0); } -- 2.30.2