diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae29ed1021d..7fba7a8d1f9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 04:10:35 1998  Richard Henderson  <rth@cygnus.com>
+
+	* expr.c (expand_assignment, store_constructor, expand_expr): Use
+	convert_memory_address instead of convert_to_mode when possible.
+
 Wed Jul  1 03:48:00 1998  Richard Henderson  <rth@cygnus.com>
 
 	* alpha.c (alpha_initialize_trampoline): Take arguments describing
diff --git a/gcc/expr.c b/gcc/expr.c
index 79c1f9257bd..e01f08a69c8 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2938,7 +2938,7 @@ expand_assignment (to, from, want_value, suggest_reg)
 	  if (GET_MODE (offset_rtx) != ptr_mode)
 	    {
 #ifdef POINTERS_EXTEND_UNSIGNED
-	      offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 1);
+	      offset_rtx = convert_memory_address (ptr_mode, offset_rtx);
 #else
 	      offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);
 #endif
@@ -3737,7 +3737,7 @@ store_constructor (exp, target, cleared)
               if (GET_MODE (offset_rtx) != ptr_mode)
                 {
 #ifdef POINTERS_EXTEND_UNSIGNED
-                  offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 1);
+                  offset_rtx = convert_memory_address (ptr_mode, offset_rtx);
 #else
                   offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);
 #endif
@@ -5974,7 +5974,7 @@ expand_expr (exp, target, tmode, modifier)
 	    if (GET_MODE (offset_rtx) != ptr_mode)
 	      {
 #ifdef POINTERS_EXTEND_UNSIGNED
-		offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 1);
+		offset_rtx = convert_memory_address (ptr_mode, offset_rtx);
 #else
 		offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);
 #endif