aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/combine.c10
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6d95d3..81d0b99 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-31 Hans-Peter Nilsson <hp@bitrange.com>
+
+ PR target/18701
+ * combine.c (gen_lowpart_for_combine): When stripping SUBREG of
+ MEM, adjust imode and isize.
+
2004-12-30 Richard Henderson <rth@redhat.com>
* config/ia64/ia64.c (hfa_element_mode): Return false for
diff --git a/gcc/combine.c b/gcc/combine.c
index 800e65e..61b93dd 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -9355,8 +9355,16 @@ gen_lowpart_for_combine (enum machine_mode omode, rtx x)
if (GET_CODE (x) == SUBREG && MEM_P (SUBREG_REG (x)))
{
x = SUBREG_REG (x);
- if (GET_MODE (x) == omode)
+
+ /* For use in case we fall down into the address adjustments
+ further below, we need to adjust the known mode and size of
+ x; imode and isize, since we just adjusted x. */
+ imode = GET_MODE (x);
+
+ if (imode == omode)
return x;
+
+ isize = GET_MODE_SIZE (imode);
}
result = gen_lowpart_common (omode, x);