diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-07-15 12:17:54 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-07-15 12:17:54 +0200 |
| commit | b4e4232dc53bbe172d5a7f2a4df972846d8508c6 (patch) | |
| tree | 5543d61cd34cab5ac95d722b8fd9da0a241d17ea /gcc/fold-const.c | |
| parent | 00838d9ae17529661245350976a8f1ce5e553415 (diff) | |
| download | gcc-b4e4232dc53bbe172d5a7f2a4df972846d8508c6.zip gcc-b4e4232dc53bbe172d5a7f2a4df972846d8508c6.tar.gz gcc-b4e4232dc53bbe172d5a7f2a4df972846d8508c6.tar.bz2 | |
re PR middle-end/40747 (wrong code for int-is-in-range test at -O1 and above)
PR middle-end/40747
* fold-const.c (fold_cond_expr_with_comparison): When folding
< and <= to MIN, make sure the MIN uses the same type as the
comparison's operands.
* gcc.c-torture/execute/pr40747.c: New test.
From-SVN: r149675
Diffstat (limited to 'gcc/fold-const.c')
| -rw-r--r-- | gcc/fold-const.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/gcc/fold-const.c b/gcc/fold-const.c index f3e0614..eba8690 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -5310,31 +5310,35 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) return fold_build3 (COND_EXPR, type, arg0, arg1, arg2); case LT_EXPR: - /* If C1 is C2 + 1, this is min(A, C2). */ + /* If C1 is C2 + 1, this is min(A, C2), but use ARG00's type for + MIN_EXPR, to preserve the signedness of the comparison. */ if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type), OEP_ONLY_CONST) && operand_equal_p (arg01, const_binop (PLUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_build2 (MIN_EXPR, - type, - fold_convert (type, arg1), - arg2)); + { + tem = fold_build2 (MIN_EXPR, TREE_TYPE (arg00), arg00, + fold_convert (TREE_TYPE (arg00), arg2)); + return pedantic_non_lvalue (fold_convert (type, tem)); + } break; case LE_EXPR: - /* If C1 is C2 - 1, this is min(A, C2). */ + /* If C1 is C2 - 1, this is min(A, C2), with the same care + as above. */ if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type), OEP_ONLY_CONST) && operand_equal_p (arg01, const_binop (MINUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_build2 (MIN_EXPR, - type, - fold_convert (type, arg1), - arg2)); + { + tem = fold_build2 (MIN_EXPR, TREE_TYPE (arg00), arg00, + fold_convert (TREE_TYPE (arg00), arg2)); + return pedantic_non_lvalue (fold_convert (type, tem)); + } break; case GT_EXPR: @@ -5346,11 +5350,11 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) const_binop (MINUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_convert (type, - fold_build2 (MAX_EXPR, TREE_TYPE (arg00), - arg00, - fold_convert (TREE_TYPE (arg00), - arg2)))); + { + tem = fold_build2 (MAX_EXPR, TREE_TYPE (arg00), arg00, + fold_convert (TREE_TYPE (arg00), arg2)); + return pedantic_non_lvalue (fold_convert (type, tem)); + } break; case GE_EXPR: @@ -5361,11 +5365,11 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) const_binop (PLUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_convert (type, - fold_build2 (MAX_EXPR, TREE_TYPE (arg00), - arg00, - fold_convert (TREE_TYPE (arg00), - arg2)))); + { + tem = fold_build2 (MAX_EXPR, TREE_TYPE (arg00), arg00, + fold_convert (TREE_TYPE (arg00), arg2)); + return pedantic_non_lvalue (fold_convert (type, tem)); + } break; case NE_EXPR: break; |