From 03989f55955ddb1f82ce79a7c2251039d0ba5d0e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 10 Nov 2011 16:36:48 +0100 Subject: [PATCH] re PR rtl-optimization/51023 (likely integer wrong code bug) PR rtl-optimization/51023 * combine.c (simplify_comparison) : Don't use val_signbit_known_clear_p for signed comparison narrowing optimization. Don't check for non-VOIDmode, use HWI_COMPUTABLE_MODE_P macro. : Don't check for non-VOIDmode. Optimize even when const_op is equal to GET_MODE_MASK (mode), don't optimize if const_op is negative. * gcc.c-torture/execute/pr51023.c: New test. From-SVN: r181257 --- gcc/ChangeLog | 11 +++++++++++ gcc/combine.c | 10 ++++++---- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/execute/pr51023.c | 18 ++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr51023.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 404b8843dae..faea63af24d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2011-11-10 Jakub Jelinek + + PR rtl-optimization/51023 + * combine.c (simplify_comparison) : Don't use + val_signbit_known_clear_p for signed comparison narrowing + optimization. Don't check for non-VOIDmode, use + HWI_COMPUTABLE_MODE_P macro. + : Don't check for non-VOIDmode. + Optimize even when const_op is equal to GET_MODE_MASK (mode), + don't optimize if const_op is negative. + 2011-11-10 Richard Guenther PR tree-optimization/51042 diff --git a/gcc/combine.c b/gcc/combine.c index ad9aa389871..1714c749e16 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -11397,9 +11397,10 @@ simplify_comparison (enum rtx_code code, rtx *pop0, rtx *pop1) later on, and then we wouldn't know whether to sign- or zero-extend. */ mode = GET_MODE (XEXP (op0, 0)); - if (mode != VOIDmode && GET_MODE_CLASS (mode) == MODE_INT + if (GET_MODE_CLASS (mode) == MODE_INT && ! unsigned_comparison_p - && val_signbit_known_clear_p (mode, const_op) + && HWI_COMPUTABLE_MODE_P (mode) + && trunc_int_for_mode (const_op, mode) == const_op && have_insn_for (COMPARE, mode)) { op0 = XEXP (op0, 0); @@ -11477,10 +11478,11 @@ simplify_comparison (enum rtx_code code, rtx *pop0, rtx *pop1) case ZERO_EXTEND: mode = GET_MODE (XEXP (op0, 0)); - if (mode != VOIDmode && GET_MODE_CLASS (mode) == MODE_INT + if (GET_MODE_CLASS (mode) == MODE_INT && (unsigned_comparison_p || equality_comparison_p) && HWI_COMPUTABLE_MODE_P (mode) - && ((unsigned HOST_WIDE_INT) const_op < GET_MODE_MASK (mode)) + && (unsigned HOST_WIDE_INT) const_op <= GET_MODE_MASK (mode) + && const_op >= 0 && have_insn_for (COMPARE, mode)) { op0 = XEXP (op0, 0); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ecfcdbe9b5e..ffa8b57d8fa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-10 Jakub Jelinek + + PR rtl-optimization/51023 + * gcc.c-torture/execute/pr51023.c: New test. + 2011-11-10 Richard Guenther PR tree-optimization/51042 diff --git a/gcc/testsuite/gcc.c-torture/execute/pr51023.c b/gcc/testsuite/gcc.c-torture/execute/pr51023.c new file mode 100644 index 00000000000..34252ea0ae0 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr51023.c @@ -0,0 +1,18 @@ +/* PR rtl-optimization/51023 */ + +extern void abort (void); + +short int +foo (long int x) +{ + return x; +} + +int +main () +{ + long int a = 0x4272AL; + if (foo (a) == a) + abort (); + return 0; +}