* cfgcleanup.c (merge_memattrs): Look at the value of MEM_SIZE,

	not the pointers.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ec3a32..ce84375 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-30  Steven Bosscher  <stevenb@suse.de>
+
+       * cfgcleanup.c (merge_memattrs): Look at the value of MEM_SIZE,
+       not the pointers.
+
 2004-08-30  Geoffrey Keating  <geoffk@apple.com>
 
        PR 12738

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 91412cf..bfbf4b4 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -967,7 +967,8 @@ merge_memattrs (rtx x, rtx y)
              set_mem_offset (y, 0);
            }
          
-         set_mem_size (x, MAX (MEM_SIZE (x), MEM_SIZE (y)));
+         set_mem_size (x, GEN_INT (MAX (INTVAL (MEM_SIZE (x)),
+                                        INTVAL (MEM_SIZE (y)))));
          set_mem_size (y, MEM_SIZE (x));
 
          set_mem_align (x, MIN (MEM_ALIGN (x), MEM_ALIGN (y)));