From 2fdd1d9f108ee0d69d0f8c4d38093f4cbc40e8e4 Mon Sep 17 00:00:00 2001 From: pinskia Date: Fri, 15 Jul 2005 23:14:07 +0000 Subject: [PATCH] 2005-07-15 Andrew Pinski PR middle-end/22398 * gcc.c-torture/compile/pr22398.c: New test. 2005-07-11 Andrew Pinski PR middle-end/22398 * fold-const.c (build_range_check): Convert high/low to etype if we are only comparing against exp. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102067 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 9 ++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr22398.c | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr22398.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 312106e8e95..bbb9248bb5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-07-11 Andrew Pinski + + PR middle-end/22398 + * fold-const.c (build_range_check): Convert high/low to etype + if we are only comparing against exp. + 2005-07-13 Daniel Berlin Fix PR tree-optimization/22376 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 3bc27eb5d3b..0e414bc2bf1 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -3943,13 +3943,16 @@ build_range_check (tree type, tree exp, int in_p, tree low, tree high) return fold_convert (type, integer_one_node); if (low == 0) - return fold_build2 (LE_EXPR, type, exp, high); + return fold_build2 (LE_EXPR, type, exp, + fold_convert (etype, high)); if (high == 0) - return fold_build2 (GE_EXPR, type, exp, low); + return fold_build2 (GE_EXPR, type, exp, + fold_convert (etype, low)); if (operand_equal_p (low, high, 0)) - return fold_build2 (EQ_EXPR, type, exp, low); + return fold_build2 (EQ_EXPR, type, exp, + fold_convert (etype, low)); if (integer_zerop (low)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4787bccf5b3..61d87257fef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-07-15 Andrew Pinski + + PR middle-end/22398 + * gcc.c-torture/compile/pr22398.c: New test. + 2005-07-15 Mark Mitchell PR c++/22132 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr22398.c b/gcc/testsuite/gcc.c-torture/compile/pr22398.c new file mode 100644 index 00000000000..448de5712cd --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr22398.c @@ -0,0 +1,21 @@ +#if ULONG_MAX != 4294967295u && ULONG_MAX != 18446744073709551615ull +int main(void) { exit (0); } +#else +#if ULONG_MAX != 18446744073709551615ull +#define NUM 0xf0000000 +#else +#define NUM 0xf000000000000000 +#endif + + +int func1(void *rw) +{ + return (rw && (((unsigned long) rw) >= NUM) ); +} + +void func2(void *rw) +{ + while(rw && (((unsigned long) rw) >= NUM) ) {} +} + +#endif -- 2.11.0