diff options
| author | Richard Sandiford <r.sandiford@uk.ibm.com> | 2014-05-26 18:50:55 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2014-05-26 18:50:55 +0000 |
| commit | 3e26c8f6099f045cc5804968bbe7ad56ef28ab5c (patch) | |
| tree | 21a0a8b4063a6435c89c6ef18670302306d554e3 /gcc | |
| parent | cf0ff174cd17856e67b222efaaf4344adc3e4410 (diff) | |
| download | gcc-3e26c8f6099f045cc5804968bbe7ad56ef28ab5c.zip gcc-3e26c8f6099f045cc5804968bbe7ad56ef28ab5c.tar.gz gcc-3e26c8f6099f045cc5804968bbe7ad56ef28ab5c.tar.bz2 | |
re PR rtl-optimization/61222 (ICE on valid code at -O2 and -O3 on x86_64-linux-gnu in decompose, at rtl.h:1456)
gcc/
PR rtl-optimization/61222
* combine.c (simplify_shift_const_1): When moving a PLUS outside
the shift, truncate the PLUS operand to the result mode.
gcc/testsuite/
PR rtl-optimization/61222
* gcc.c-torture/compile/pr61222-1.c: New test.
* gcc.c-torture/compile/pr61222-2.c: Likewise.
From-SVN: r210945
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/combine.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr61222-1.c | 23 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr61222-2.c | 7 |
5 files changed, 50 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7764890..9d5ae92 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-05-26 Richard Sandiford <r.sandiford@uk.ibm.com> + + PR rtl-optimization/61222 + * combine.c (simplify_shift_const_1): When moving a PLUS outside + the shift, truncate the PLUS operand to the result mode. + 2014-05-26 Uros Bizjak <ubizjak@gmail.com> PR target/61271 diff --git a/gcc/combine.c b/gcc/combine.c index 061b4d5..72bde7a 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -10349,9 +10349,10 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode, /* (ashift (plus foo C) N) is (plus (ashift foo N) C'). */ if (code == ASHIFT && CONST_INT_P (XEXP (varop, 1)) - && (new_rtx = simplify_const_binary_operation (ASHIFT, result_mode, - XEXP (varop, 1), - GEN_INT (count))) != 0 + && (new_rtx = simplify_const_binary_operation + (ASHIFT, result_mode, + gen_int_mode (INTVAL (XEXP (varop, 1)), result_mode), + GEN_INT (count))) != 0 && CONST_INT_P (new_rtx) && merge_outer_ops (&outer_op, &outer_const, PLUS, INTVAL (new_rtx), result_mode, &complement_p)) @@ -10368,9 +10369,10 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode, if (code == LSHIFTRT && CONST_INT_P (XEXP (varop, 1)) && mode_signbit_p (result_mode, XEXP (varop, 1)) - && (new_rtx = simplify_const_binary_operation (code, result_mode, - XEXP (varop, 1), - GEN_INT (count))) != 0 + && (new_rtx = simplify_const_binary_operation + (code, result_mode, + gen_int_mode (INTVAL (XEXP (varop, 1)), result_mode), + GEN_INT (count))) != 0 && CONST_INT_P (new_rtx) && merge_outer_ops (&outer_op, &outer_const, XOR, INTVAL (new_rtx), result_mode, &complement_p)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f3305a3..a9eab00 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-26 Richard Sandiford <r.sandiford@uk.ibm.com> + + PR rtl-optimization/61222 + * gcc.c-torture/compile/pr61222-1.c: New test. + * gcc.c-torture/compile/pr61222-2.c: Likewise. + 2014-05-26 Uros Bizjak <ubizjak@gmail.com> * c-c++-common/cilk-plus/AN/pr61191.c: Fix dg-error directives. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr61222-1.c b/gcc/testsuite/gcc.c-torture/compile/pr61222-1.c new file mode 100644 index 0000000..8890193 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr61222-1.c @@ -0,0 +1,23 @@ +int a, b, d, e; +char c; + +void +foo () +{ + for (; a; a++) + { + d = ((b == 0) ^ (129 + a)); + c = d * 9; + e = c < 1; + if (e) + for (;;) + ; + } +} + +int +main () +{ + foo (); + return 0; +} diff --git a/gcc/testsuite/gcc.c-torture/compile/pr61222-2.c b/gcc/testsuite/gcc.c-torture/compile/pr61222-2.c new file mode 100644 index 0000000..23611c1 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr61222-2.c @@ -0,0 +1,7 @@ +int a, b, d; +int main (void) +{ + int c = a && 1; + d = 1 << (((c | (b - 842)) << 1) + 1); + return 0; +} |