diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/pr24141.c | 33 | ||||
| -rw-r--r-- | gcc/tree-vrp.c | 9 |
4 files changed, 52 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95db709..2971178 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-10-01 Diego Novillo <dnovillo@redhat.com> + + 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 <phython@gcc.gnu.org> Diego Novillo <dnovillo@redhat.com> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aff2b8d..d90b90b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-10-01 Diego Novillo <dnovillo@redhat.com> + + PR 24141 + * gcc.c-torture/execute/pr24141.c: New test. + 2005-10-01 James A. Morrison <phython@gcc.gnu.org> Diego Novillo <dnovillo@redhat.com> 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 0000000..3012962 --- /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 21e6cf6..0e5ea09 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); } |