From ada11335549cffb57812505d5c383af118de5c3e Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Fri, 24 Aug 2001 12:18:45 +0000 Subject: [PATCH] fold-const.c (tree_expr_nonnegative_p): Handle *_DIV_EXPR, *_MOD_EXPR, SAVE_EXPR and NON_LVALUE_EXPR. * fold-const.c (tree_expr_nonnegative_p): Handle *_DIV_EXPR, *_MOD_EXPR, SAVE_EXPR and NON_LVALUE_EXPR. testsuite: * gcc.dg/compare5.c: New testcase. From-SVN: r45148 --- gcc/ChangeLog | 5 ++++ gcc/fold-const.c | 15 ++++++++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/compare5.c | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/compare5.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ef1c8a94eba..9d4ebaa7907 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-08-24 Kaveh R. Ghazi + + * fold-const.c (tree_expr_nonnegative_p): Handle *_DIV_EXPR, + *_MOD_EXPR, SAVE_EXPR and NON_LVALUE_EXPR. + 2001-08-23 Jason Merrill * c-pragma.h: Move weak_syms and weak_decls... diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 9b99c8f6734..90d9f16b69e 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -7397,6 +7397,17 @@ tree_expr_nonnegative_p (t) return 1; case INTEGER_CST: return tree_int_cst_sgn (t) >= 0; + case TRUNC_DIV_EXPR: + case CEIL_DIV_EXPR: + case FLOOR_DIV_EXPR: + case ROUND_DIV_EXPR: + return tree_expr_nonnegative_p (TREE_OPERAND (t, 0)) + && tree_expr_nonnegative_p (TREE_OPERAND (t, 1)); + case TRUNC_MOD_EXPR: + case CEIL_MOD_EXPR: + case FLOOR_MOD_EXPR: + case ROUND_MOD_EXPR: + return tree_expr_nonnegative_p (TREE_OPERAND (t, 0)); case COND_EXPR: return tree_expr_nonnegative_p (TREE_OPERAND (t, 1)) && tree_expr_nonnegative_p (TREE_OPERAND (t, 2)); @@ -7412,6 +7423,10 @@ tree_expr_nonnegative_p (t) return tree_expr_nonnegative_p (TREE_OPERAND (t, 1)); case BIND_EXPR: return tree_expr_nonnegative_p (TREE_OPERAND (t, 1)); + case SAVE_EXPR: + return tree_expr_nonnegative_p (TREE_OPERAND (t, 0)); + case NON_LVALUE_EXPR: + return tree_expr_nonnegative_p (TREE_OPERAND (t, 0)); case RTL_EXPR: return rtl_expr_nonnegative_p (RTL_EXPR_RTL (t)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5284f326607..d79044b9aaf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2001-08-24 Kaveh R. Ghazi + + * gcc.dg/compare5.c: New testcase. + 2001-08-23 Jason Merrill * lib/prune.exp (prune_gcc_output): Also ignore "In constructor" diff --git a/gcc/testsuite/gcc.dg/compare5.c b/gcc/testsuite/gcc.dg/compare5.c new file mode 100644 index 00000000000..f19c575efb7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/compare5.c @@ -0,0 +1,41 @@ +/* Test for a bogus warning on comparison between signed and unsigned. + Origin: Kaveh R. Ghazi 8/21/2001. */ + +/* { dg-do compile } */ +/* { dg-options "-Wsign-compare" } */ + +extern void bar(void); + +int foo(int x, int y, unsigned u) +{ + /* A *_DIV_EXPR is non-negative if both operands are. */ + + if (u < ((x=-22)/33)) /* { dg-warning "signed and unsigned" "DIV_EXPR" } */ + return x; + + if (u < ((x=22)/33)) + return x; + + if (u < ((x=22)/(y=33))) + return x; + + if (u < (((x&0x10000)?128:64) / ((y&0x10000)?8:4))) + return x; + + + /* A *_MOD_EXPR is non-negative if the first operand is. */ + + if (u < ((x=-22)%33)) /* { dg-warning "signed and unsigned" "MOD_EXPR" } */ + return x; + + if (u < ((x=22)%-33)) + return x; + + if (u < ((x==y)%-33)) + return x; + + if (u < (((x=22)/33)%-33)) + return x; + + return 0; +} -- 2.30.2