diff options
| author | Ian Lance Taylor <iant@google.com> | 2008-04-22 21:23:23 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2008-04-22 21:23:23 +0000 |
| commit | b2f06c39b01335127308567e5e074c3218011420 (patch) | |
| tree | 976b9798182677c5c456dcd680a49a1515900333 /gcc/fold-const.c | |
| parent | aafc759a8a4e404469bf39a92bb10522baf4a281 (diff) | |
| download | gcc-b2f06c39b01335127308567e5e074c3218011420.zip gcc-b2f06c39b01335127308567e5e074c3218011420.tar.gz gcc-b2f06c39b01335127308567e5e074c3218011420.tar.bz2 | |
fold-const.c (pointer_may_wrap_p): Call int_size_in_bytes rather than size_in_bytes.
./: * fold-const.c (pointer_may_wrap_p): Call int_size_in_bytes rather
than size_in_bytes.
testsuite/:
* gcc.c-torture/compile/20080419-1.c: New test.
From-SVN: r134566
Diffstat (limited to 'gcc/fold-const.c')
| -rw-r--r-- | gcc/fold-const.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/gcc/fold-const.c b/gcc/fold-const.c index f5ec30c..4015f62 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -8401,9 +8401,8 @@ maybe_canonicalize_comparison (enum tree_code code, tree type, static bool pointer_may_wrap_p (tree base, tree offset, HOST_WIDE_INT bitpos) { - tree size; unsigned HOST_WIDE_INT offset_low, total_low; - HOST_WIDE_INT offset_high, total_high; + HOST_WIDE_INT size, offset_high, total_high; if (!POINTER_TYPE_P (TREE_TYPE (base))) return true; @@ -8411,21 +8410,6 @@ pointer_may_wrap_p (tree base, tree offset, HOST_WIDE_INT bitpos) if (bitpos < 0) return true; - size = size_in_bytes (TREE_TYPE (TREE_TYPE (base))); - if (size == NULL_TREE || TREE_CODE (size) != INTEGER_CST) - return true; - - /* We can do slightly better for SIZE if we have an ADDR_EXPR of an - array. */ - if (TREE_CODE (base) == ADDR_EXPR) - { - tree base_size = size_in_bytes (TREE_TYPE (TREE_OPERAND (base, 0))); - if (base_size != NULL_TREE - && TREE_CODE (base_size) == INTEGER_CST - && INT_CST_LT_UNSIGNED (size, base_size)) - size = base_size; - } - if (offset == NULL_TREE) { offset_low = 0; @@ -8445,13 +8429,25 @@ pointer_may_wrap_p (tree base, tree offset, HOST_WIDE_INT bitpos) true)) return true; - if ((unsigned HOST_WIDE_INT) total_high - < (unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (size)) - return false; - if ((unsigned HOST_WIDE_INT) total_high - > (unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (size)) + if (total_high != 0) return true; - return total_low > TREE_INT_CST_LOW (size); + + size = int_size_in_bytes (TREE_TYPE (TREE_TYPE (base))); + if (size <= 0) + return true; + + /* We can do slightly better for SIZE if we have an ADDR_EXPR of an + array. */ + if (TREE_CODE (base) == ADDR_EXPR) + { + HOST_WIDE_INT base_size; + + base_size = int_size_in_bytes (TREE_TYPE (TREE_OPERAND (base, 0))); + if (base_size > 0 && size < base_size) + size = base_size; + } + + return total_low > (unsigned HOST_WIDE_INT) size; } /* Subroutine of fold_binary. This routine performs all of the |