From 7ddf4d5acea6123be6f3040e7306b5ea2cb2d651 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Sat, 14 Dec 2013 12:19:56 +0000 Subject: re PR sanitizer/59503 (Bogus integer-overflow error with long long with -m32) PR sanitizer/59503 * internal-fn.c (ubsan_expand_si_overflow_addsub_check): Call expand_binop with correct optab depending on code. testsuite/ * c-c++-common/ubsan/pr59503.c: New test. From-SVN: r205984 --- gcc/internal-fn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/internal-fn.c') diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c index ad9c947..a0874d4 100644 --- a/gcc/internal-fn.c +++ b/gcc/internal-fn.c @@ -214,14 +214,14 @@ ubsan_expand_si_overflow_addsub_check (tree_code code, gimple stmt) /* Compute the operation. On RTL level, the addition is always unsigned. */ - res = expand_binop (mode, add_optab, op0, op1, - NULL_RTX, false, OPTAB_LIB_WIDEN); + res = expand_binop (mode, code == PLUS_EXPR ? add_optab : sub_optab, + op0, op1, NULL_RTX, false, OPTAB_LIB_WIDEN); /* If the op1 is negative, we have to use a different check. */ emit_cmp_and_jump_insns (op1, const0_rtx, LT, NULL_RTX, mode, false, sub_check, PROB_EVEN); - /* Compare the result of the addition with one of the operands. */ + /* Compare the result of the operation with one of the operands. */ emit_cmp_and_jump_insns (res, op0, code == PLUS_EXPR ? GE : LE, NULL_RTX, mode, false, done_label, PROB_VERY_LIKELY); -- cgit v1.1