diff options
| author | Kyrylo Tkachov <kyrylo.tkachov@arm.com> | 2015-05-14 13:16:32 +0000 |
|---|---|---|
| committer | Kyrylo Tkachov <kyrylo.tkachov@arm.com> | 2015-05-14 13:16:32 +0000 |
| commit | a13e585d9d2cc01125c7626a26c8de6bba907eae (patch) | |
| tree | 74fddf0a6ff67986b65c5cacedff5a54b6139794 | |
| parent | 39ce48abfec9ac3bf629dcb18695d8472e7a690c (diff) | |
[ARM] Fix PR 65955: Do not take REGNO on non-REG operand in movcond_addsi
Backport from mainline
2015-05-12 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/65955
* config/arm/arm.md (movcond_addsi): Check that operands[2] is a
REG before taking its REGNO.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@223195 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/arm/arm.md | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96ec517a2ed..62dbdd26f7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2015-05-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com> + + Backport from mainline + 2015-05-12 Kyrylo Tkachov <kyrylo.tkachov@arm.com> + + PR target/65955 + * config/arm/arm.md (movcond_addsi): Check that operands[2] is a + REG before taking its REGNO. + 2015-05-12 Andreas Krebbel <krebbel@linux.vnet.ibm.com> * config/s390/2827.md: Split zEC12_simple into zEC12_simple_int diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 93b25e99c5b..7ca816218a6 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -10942,7 +10942,7 @@ enum rtx_code rc = GET_CODE (operands[5]); operands[6] = gen_rtx_REG (mode, CC_REGNUM); gcc_assert (!(mode == CCFPmode || mode == CCFPEmode)); - if (REGNO (operands[2]) != REGNO (operands[0])) + if (!REG_P (operands[2]) || REGNO (operands[2]) != REGNO (operands[0])) rc = reverse_condition (rc); else { |