diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/combine.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5301470..fa79ce9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-12-11 Segher Boessenkool <segher@kernel.crashing.org> + + * combine.c (try_combine): Do not allow combining a PARALLEL I2 + with a register move I3 if that I2 is an asm. + 2014-12-11 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * config/arm/arm_neon.h (vrndqn_f32): Rename to... diff --git a/gcc/combine.c b/gcc/combine.c index 9ed03be..c95b493 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2716,6 +2716,13 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, SET_DEST (XVECEXP (p2, 0, i)))) break; + /* Make sure this PARALLEL is not an asm. We do not allow combining + that usually (see can_combine_p), so do not here either. */ + for (i = 0; i < XVECLEN (p2, 0); i++) + if (GET_CODE (XVECEXP (p2, 0, i)) == SET + && GET_CODE (SET_SRC (XVECEXP (p2, 0, i))) == ASM_OPERANDS) + break; + if (i == XVECLEN (p2, 0)) for (i = 0; i < XVECLEN (p2, 0); i++) if (GET_CODE (XVECEXP (p2, 0, i)) == SET |