From 8b3c295192e3886940be529ebd380b093d77fdef Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 3 Jan 2012 08:59:21 +0000 Subject: [PATCH] re PR c/51730 (autoconf 2.60 through 2.67 stdbool.h check fails with GCC 4.7) 2012-01-03 Richard Guenther PR middle-end/51730 * fold-const.c (fold_comparison): Properly canonicalize tree offset and HOST_WIDE_INT bit position. * gcc.dg/fold-compare-6.c: New testcase. From-SVN: r182830 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 16 ++++++++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/fold-compare-6.c | 12 ++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/fold-compare-6.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9329b4748d..21533a34287 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-03 Richard Guenther + + PR middle-end/51730 + * fold-const.c (fold_comparison): Properly canonicalize + tree offset and HOST_WIDE_INT bit position. + 2012-01-02 Uros Bizjak * config/ia64/ia64.c (expand_vec_perm_broadcast): Use correct diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 5d3196b7377..b88b5d72621 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -8886,6 +8886,14 @@ fold_comparison (location_t loc, enum tree_code code, tree type, indirect_base0 = true; } offset0 = TREE_OPERAND (arg0, 1); + if (host_integerp (offset0, 0) + && ((HOST_WIDE_INT) (TREE_INT_CST_LOW (offset0) * BITS_PER_UNIT) + / BITS_PER_UNIT + == (HOST_WIDE_INT) TREE_INT_CST_LOW (offset0))) + { + bitpos0 = TREE_INT_CST_LOW (offset0) * BITS_PER_UNIT; + offset0 = NULL_TREE; + } } base1 = arg1; @@ -8909,6 +8917,14 @@ fold_comparison (location_t loc, enum tree_code code, tree type, indirect_base1 = true; } offset1 = TREE_OPERAND (arg1, 1); + if (host_integerp (offset1, 0) + && ((HOST_WIDE_INT) (TREE_INT_CST_LOW (offset1) * BITS_PER_UNIT) + / BITS_PER_UNIT + == (HOST_WIDE_INT) TREE_INT_CST_LOW (offset1))) + { + bitpos1 = TREE_INT_CST_LOW (offset1) * BITS_PER_UNIT; + offset1 = NULL_TREE; + } } /* A local variable can never be pointed to by diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8e84b3a6466..70a292b671b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-03 Richard Guenther + + PR middle-end/51730 + * gcc.dg/fold-compare-6.c: New testcase. + 2012-01-03 Jakub Jelinek PR c++/51669 diff --git a/gcc/testsuite/gcc.dg/fold-compare-6.c b/gcc/testsuite/gcc.dg/fold-compare-6.c new file mode 100644 index 00000000000..7ddf6b44dab --- /dev/null +++ b/gcc/testsuite/gcc.dg/fold-compare-6.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-fdump-tree-original" } */ + +char digs[] = "0123456789"; +int foo (void) +{ + int xlcbug = 1 / (&(digs + 5)[-2 + (_Bool) 1] == &digs[4] ? 1 : -1); + return xlcbug; +} + +/* { dg-final { scan-tree-dump "xlcbug = 1;" "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */ -- 2.30.2