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

+2001-12-13  Richard Henderson  <rth@redhat.com>
+
+	* emit-rtl.c (adjust_address_1): Don't adjust address if adjust
+	is false.
+
 2001-12-13  Richard Earnshaw  <rearnsha@arm.com>
 
 	* collect2.c (COLLECT_SHARED_INIT_FUNC)

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);