From ac2be67b328e79b3be27b0559de62f054f8bf4c7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 4 Jan 2018 22:54:23 +0100 Subject: [PATCH] re PR target/83554 (ICE: in ix86_mitigate_rop, at config/i386/i386.c:41274 with -mmitigate-rop) PR target/83554 * config/i386/i386.md (*hi3_1 splitter): Use QIreg_operand instead of register_operand predicate. * config/i386/i386.c (ix86_rop_should_change_byte_p, set_rop_modrm_reg_bits, ix86_mitigate_rop): Use -mmitigate-rop in comments instead of -fmitigate[-_]rop. * gcc.target/i386/pr83554.c: New test. Co-Authored-By: Uros Bizjak From-SVN: r256268 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/i386/i386.c | 6 +++--- gcc/config/i386/i386.md | 2 +- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.target/i386/pr83554.c | 15 +++++++++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr83554.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0692c62a984..58ec5052483 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2018-01-04 Jakub Jelinek + Uros Bizjak + + PR target/83554 + * config/i386/i386.md (*hi3_1 splitter): Use + QIreg_operand instead of register_operand predicate. + * config/i386/i386.c (ix86_rop_should_change_byte_p, + set_rop_modrm_reg_bits, ix86_mitigate_rop): Use -mmitigate-rop in + comments instead of -fmitigate[-_]rop. + 2018-01-04 Rainer Orth PR bootstrap/81926 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index c363de93e02..9956d56f65d 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -3089,7 +3089,7 @@ ix86_debug_options (void) } /* Return true if T is one of the bytes we should avoid with - -fmitigate-rop. */ + -mmitigate-rop. */ static bool ix86_rop_should_change_byte_p (int t) @@ -41175,7 +41175,7 @@ ix86_seh_fixup_eh_fallthru (void) /* Given a register number BASE, the lowest of a group of registers, update regsets IN and OUT with the registers that should be avoided in input and output operands respectively when trying to avoid generating a modr/m - byte for -fmitigate-rop. */ + byte for -mmitigate-rop. */ static void set_rop_modrm_reg_bits (int base, HARD_REG_SET &in, HARD_REG_SET &out) @@ -41186,7 +41186,7 @@ set_rop_modrm_reg_bits (int base, HARD_REG_SET &in, HARD_REG_SET &out) SET_HARD_REG_BIT (in, base + 3); } -/* Called if -fmitigate_rop is in effect. Try to rewrite instructions so +/* Called if -mmitigate-rop is in effect. Try to rewrite instructions so that certain encodings of modr/m bytes do not occur. */ static void ix86_mitigate_rop (void) diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 59118525ae7..3f587806407 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -11643,7 +11643,7 @@ (set_attr "mode" "QI")]) (define_split - [(set (match_operand:HI 0 "register_operand") + [(set (match_operand:HI 0 "QIreg_operand") (any_rotate:HI (match_dup 0) (const_int 8))) (clobber (reg:CC FLAGS_REG))] "reload_completed diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f7d629e7f42..90f4d5740c5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-01-04 Jakub Jelinek + PR target/83554 + * gcc.target/i386/pr83554.c: New test. + PR ipa/82352 * g++.dg/ipa/pr82352.C (size_t): Define to __SIZE_TYPE__ instead of long unsigned int. diff --git a/gcc/testsuite/gcc.target/i386/pr83554.c b/gcc/testsuite/gcc.target/i386/pr83554.c new file mode 100644 index 00000000000..63ab366ae90 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr83554.c @@ -0,0 +1,15 @@ +/* PR target/83554 */ +/* { dg-do compile { target int128 } } */ +/* { dg-options "-Os -mmitigate-rop" } */ + +unsigned a; +unsigned __int128 +foo (unsigned char c, unsigned short d, unsigned e, unsigned long f, + unsigned __int128 g, unsigned h, unsigned short i, unsigned long j) +{ + j /= (unsigned)-2; + h += h &= c == c; + h -= g; + i = i >> 8 | i << 8; + return c + d + e + f + g + h + i + j + a; +} -- 2.30.2