integrate.c (copy_rtx_and_substitute): Fix error last change: we need to unconditiona...

        * integrate.c (copy_rtx_and_substitute): Fix error last change:
        we need to unconditionally create a new mem.

From-SVN: r48403

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 32d6170e19212eb7feef8c048f8556959d2097e3..15d4560af682ca9758aa4c63e2648f1194118280 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-30  Richard Henderson  <rth@redhat.com>
+
+       * integrate.c (copy_rtx_and_substitute): Fix error last change:
+       we need to unconditionally create a new mem.
+
 2001-12-30  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * config/mmix/mmix.md ("*call_real"): Fix typo in comment.

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 47c4a4db1351890210ee627a1ef6896133ee5c06..9143e0e09e5aa2d66364f6acf004d7dde8917b44 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -2263,9 +2263,9 @@ copy_rtx_and_substitute (orig, map, for_lhs)
          return validize_mem (force_const_mem (const_mode, constant));
        }
 
-     copy = replace_equiv_address_nv (orig,
-                                     copy_rtx_and_substitute (XEXP (orig, 0),
-                                                              map, 0));
+      copy = gen_rtx_MEM (mode, copy_rtx_and_substitute (XEXP (orig, 0),
+                                                        map, 0));
+      MEM_COPY_ATTRIBUTES (copy, orig);
 
       /* If inlining and this is not for the LHS, turn off RTX_UNCHANGING_P
         since this may be an indirect reference to a parameter and the