diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a1823a323e..50fddfe3ee3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-08  Roger Sayle  <roger@eyesopen.com>
+
+	* function.c (gen_mem_addressof): When changing the RTX from a REG
+	to a MEM, clear MEM_VOLATILE_P which was formerly REG_USERVAR_P.
+
 2004-04-08  Roger Sayle  <roger@eyesopen.com>
 
 	PR target/14888
diff --git a/gcc/function.c b/gcc/function.c
index 90de28400e5..e0308640335 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -2856,6 +2856,7 @@ gen_mem_addressof (rtx reg, tree decl, int rescan)
   RTX_UNCHANGING_P (XEXP (r, 0)) = RTX_UNCHANGING_P (reg);
 
   PUT_CODE (reg, MEM);
+  MEM_VOLATILE_P (reg) = 0;
   MEM_ATTRS (reg) = 0;
   XEXP (reg, 0) = r;
 
@@ -2888,11 +2889,9 @@ gen_mem_addressof (rtx reg, tree decl, int rescan)
     {
       /* This can only happen during reload.  Clear the same flag bits as
 	 reload.  */
-      MEM_VOLATILE_P (reg) = 0;
       RTX_UNCHANGING_P (reg) = 0;
       MEM_IN_STRUCT_P (reg) = 0;
       MEM_SCALAR_P (reg) = 0;
-      MEM_ATTRS (reg) = 0;
 
       fixup_var_refs (reg, GET_MODE (reg), 0, reg, 0);
     }