diff options
Diffstat (limited to 'gcc/fold-const.c')
| -rw-r--r-- | gcc/fold-const.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gcc/fold-const.c b/gcc/fold-const.c index f0ff5b6..9a2687a 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -5337,31 +5337,34 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) break; case GT_EXPR: - /* If C1 is C2 - 1, this is max(A, C2). */ + /* If C1 is C2 - 1, this is max(A, C2), but use ARG00's type for + MAX_EXPR, to preserve the signedness of the comparison. */ 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 (MAX_EXPR, - type, - fold_convert (type, arg1), - arg2)); + return pedantic_non_lvalue (fold_convert (type, + fold_build2 (MAX_EXPR, TREE_TYPE (arg00), + arg00, + fold_convert (TREE_TYPE (arg00), + arg2)))); break; case GE_EXPR: - /* If C1 is C2 + 1, this is max(A, C2). */ + /* If C1 is C2 + 1, this is max(A, C2), with the same care as above. */ 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 (MAX_EXPR, - type, - fold_convert (type, arg1), - arg2)); + return pedantic_non_lvalue (fold_convert (type, + fold_build2 (MAX_EXPR, TREE_TYPE (arg00), + arg00, + fold_convert (TREE_TYPE (arg00), + arg2)))); break; case NE_EXPR: break; |