From 4a78c78760016fe03c0d578ece9a5cfee8a672fd Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 13 Dec 2001 09:50:02 -0800 Subject: [PATCH] emit-rtl.c (adjust_address_1): Don't adjust address if adjust is false. * emit-rtl.c (adjust_address_1): Don't adjust address if adjust is false. From-SVN: r47978 --- gcc/ChangeLog | 5 +++++ gcc/emit-rtl.c | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 664087a4549..ab1f2601a71 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 Richard Henderson + + * emit-rtl.c (adjust_address_1): Don't adjust address if adjust + is false. + 2001-12-13 Richard Earnshaw * collect2.c (COLLECT_SHARED_INIT_FUNC) diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 72886d16a79..64a2624412d 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1967,20 +1967,23 @@ adjust_address_1 (memref, mode, offset, validate, adjust) unsigned int memalign = MEM_ALIGN (memref); /* ??? Prefer to create garbage instead of creating shared rtl. - This may happen even if adjust is non-zero -- consider + This may happen even if offset is non-zero -- consider (plus (plus reg reg) const_int) -- so do this always. */ addr = copy_rtx (addr); - /* If MEMREF is a LO_SUM and the offset is within the alignment of the - object, we can merge it into the LO_SUM. */ - if (GET_MODE (memref) != BLKmode && GET_CODE (addr) == LO_SUM - && offset >= 0 - && (unsigned HOST_WIDE_INT) offset - < GET_MODE_ALIGNMENT (GET_MODE (memref)) / BITS_PER_UNIT) - addr = gen_rtx_LO_SUM (Pmode, XEXP (addr, 0), - plus_constant (XEXP (addr, 1), offset)); - else - addr = plus_constant (addr, offset); + if (adjust) + { + /* If MEMREF is a LO_SUM and the offset is within the alignment of the + object, we can merge it into the LO_SUM. */ + if (GET_MODE (memref) != BLKmode && GET_CODE (addr) == LO_SUM + && offset >= 0 + && (unsigned HOST_WIDE_INT) offset + < GET_MODE_ALIGNMENT (GET_MODE (memref)) / BITS_PER_UNIT) + addr = gen_rtx_LO_SUM (Pmode, XEXP (addr, 0), + plus_constant (XEXP (addr, 1), offset)); + else + addr = plus_constant (addr, offset); + } new = change_address_1 (memref, mode, addr, validate); -- 2.30.2