diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-10-12 19:32:38 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-10-12 19:32:38 +0200 |
| commit | 7685fb062cc50bad395f10d9e98084bbd21605f8 (patch) | |
| tree | 7802aaff200a3d2a50aa896ab2deeca329695de3 | |
| parent | 6b30e838cd7f8dc66aa69b76c8622bf375220e95 (diff) | |
| download | gcc-7685fb062cc50bad395f10d9e98084bbd21605f8.zip gcc-7685fb062cc50bad395f10d9e98084bbd21605f8.tar.gz gcc-7685fb062cc50bad395f10d9e98084bbd21605f8.tar.bz2 | |
backport: re PR rtl-optimization/87065 (combine causes ICE in trunc_int_for_mode)
Backported from mainline
2018-08-27 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/87065
* combine.c (simplify_if_then_else): Formatting fix.
(if_then_else_cond): Guard MULT optimization with SCALAR_INT_MODE_P
check.
(known_cond): Don't return const_true_rtx for vector modes. Use
CONST0_RTX instead of const0_rtx. Formatting fixes.
* gcc.target/i386/pr87065.c: New test.
From-SVN: r265120
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/combine.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/i386/pr87065.c | 22 |
4 files changed, 42 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c09e3c7..8a5d1f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,15 @@ 2018-10-12 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2018-08-27 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/87065 + * combine.c (simplify_if_then_else): Formatting fix. + (if_then_else_cond): Guard MULT optimization with SCALAR_INT_MODE_P + check. + (known_cond): Don't return const_true_rtx for vector modes. Use + CONST0_RTX instead of const0_rtx. Formatting fixes. + 2018-07-24 Jakub Jelinek <jakub@redhat.com> PR middle-end/86627 diff --git a/gcc/combine.c b/gcc/combine.c index b6024bf..ed07cb6 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -6277,7 +6277,7 @@ simplify_if_then_else (rtx x) pc_rtx, pc_rtx, 0, 0, 0); if (reg_mentioned_p (from, false_rtx)) false_rtx = subst (known_cond (copy_rtx (false_rtx), false_code, - from, false_val), + from, false_val), pc_rtx, pc_rtx, 0, 0, 0); SUBST (XEXP (x, 1), swapped ? false_rtx : true_rtx); @@ -9035,6 +9035,7 @@ if_then_else_cond (rtx x, rtx *ptrue, rtx *pfalse) if (COMPARISON_P (cond0) && COMPARISON_P (cond1) + && SCALAR_INT_MODE_P (mode) && ((GET_CODE (cond0) == reversed_comparison_code (cond1, NULL) && rtx_equal_p (XEXP (cond0, 0), XEXP (cond1, 0)) && rtx_equal_p (XEXP (cond0, 1), XEXP (cond1, 1))) @@ -9183,12 +9184,12 @@ known_cond (rtx x, enum rtx_code cond, rtx reg, rtx val) if (COMPARISON_P (x)) { if (comparison_dominates_p (cond, code)) - return const_true_rtx; + return VECTOR_MODE_P (GET_MODE (x)) ? x : const_true_rtx; code = reversed_comparison_code (x, NULL); if (code != UNKNOWN && comparison_dominates_p (cond, code)) - return const0_rtx; + return CONST0_RTX (GET_MODE (x)); else return x; } @@ -9231,7 +9232,7 @@ known_cond (rtx x, enum rtx_code cond, rtx reg, rtx val) /* We must simplify subreg here, before we lose track of the original inner_mode. */ new_rtx = simplify_subreg (GET_MODE (x), r, - inner_mode, SUBREG_BYTE (x)); + inner_mode, SUBREG_BYTE (x)); if (new_rtx) return new_rtx; else @@ -9256,7 +9257,7 @@ known_cond (rtx x, enum rtx_code cond, rtx reg, rtx val) /* We must simplify the zero_extend here, before we lose track of the original inner_mode. */ new_rtx = simplify_unary_operation (ZERO_EXTEND, GET_MODE (x), - r, inner_mode); + r, inner_mode); if (new_rtx) return new_rtx; else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 986f6b6..41f3b0b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2018-10-12 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2018-08-27 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/87065 + * gcc.target/i386/pr87065.c: New test. + 2018-07-24 Jakub Jelinek <jakub@redhat.com> PR middle-end/86627 diff --git a/gcc/testsuite/gcc.target/i386/pr87065.c b/gcc/testsuite/gcc.target/i386/pr87065.c new file mode 100644 index 0000000..f1cc6f9 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr87065.c @@ -0,0 +1,22 @@ +/* PR rtl-optimization/87065 */ +/* { dg-do compile } */ +/* { dg-options "-O3 -mxop -mprefer-avx128" } */ + +int a, c, d, e; +short *b; + +void +foo (void) +{ + short *g = b; + int h = 1; + unsigned i; + for (; h <= 1; h++) + g = (short *) &c; + for (; c; c++) + { + for (; i <= 1; i++) + ; + a ^= (a > 0 <= i) + ((e += d) == 0 ?: (*g = 8)); + } +} |