* expr.c (store_field): Use adjust_address, not PUT_MODE.

	(expand_expr, case VIEW_CONVERT_EXPR): Likewise.
	* reload1.c (eliminate_regs, case SUBREG): Likewise, but use
	adjust_address_nv.
	* varasm.c (make_decl_rtl): Likewise.
	* integrate.c (copy_rtx_and_substitute, case MEM): Likewise, but use
	replace_equiv_address_nv.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48387 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 8 deletions

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 451a0906052..5844932d4cd 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -2552,14 +2552,7 @@ eliminate_regs (x, mem_mode, insn)
 		   )
 		  || x_size == new_size)
 	      )
-	    {
-	      int offset = SUBREG_BYTE (x);
-	      enum machine_mode mode = GET_MODE (x);
-
-	      PUT_MODE (new, mode);
-	      XEXP (new, 0) = plus_constant (XEXP (new, 0), offset);
-	      return new;
-	    }
+	    return adjust_address_nv (x, GET_MODE (x), SUBREG_BYTE (x));
 	  else
 	    return gen_rtx_SUBREG (GET_MODE (x), new, SUBREG_BYTE (x));
 	}