summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-23 06:07:26 +0000
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-23 06:07:26 +0000
commit30a86effd19f766507bcf82a70ce07f75513100c (patch)
tree4f86a2e953095b545d73efdd1a8123a03a35c9ab
parentee3a0978a5b76a0c303dc85259afd951c559f6d8 (diff)
downloadgcc-30a86effd19f766507bcf82a70ce07f75513100c.tar.gz
Fix HWI + -unsigned in combine.c
rtx_equal_for_field_assignment_p had: x = adjust_address_nv (x, GET_MODE (y), -subreg_lowpart_offset (GET_MODE (x), GET_MODE (y))); But subreg_lowpart_offset returns an unsigned int and adjust_address_nv takes a HWI, so a subreg offset of 4 would give a memory offset of 0x00000000fffffffffc. 2017-10-23 Richard Sandiford <richard.sandiford@linaro.org> gcc/ * combine.c (rtx_equal_for_field_assignment_p): Use byte_lowpart_offset. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253997 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/combine.c10
2 files changed, 8 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1bc0f001cc2..6caddb801b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-23 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * combine.c (rtx_equal_for_field_assignment_p): Use
+ byte_lowpart_offset.
+
2017-10-22 Richard Sandiford <richard.sandiford@linaro.org>
Alan Hayward <alan.hayward@arm.com>
David Sherwood <david.sherwood@arm.com>
diff --git a/gcc/combine.c b/gcc/combine.c
index e5c276901d8..d71e50fdefb 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -9526,13 +9526,9 @@ rtx_equal_for_field_assignment_p (rtx x, rtx y, bool widen_x)
return 0;
if (BYTES_BIG_ENDIAN != WORDS_BIG_ENDIAN)
return 0;
- /* For big endian, adjust the memory offset. */
- if (BYTES_BIG_ENDIAN)
- x = adjust_address_nv (x, GET_MODE (y),
- -subreg_lowpart_offset (GET_MODE (x),
- GET_MODE (y)));
- else
- x = adjust_address_nv (x, GET_MODE (y), 0);
+ x = adjust_address_nv (x, GET_MODE (y),
+ byte_lowpart_offset (GET_MODE (y),
+ GET_MODE (x)));
}
if (x == y || rtx_equal_p (x, y))