From: Steven Bosscher <stevenb@suse.de>
Date: Mon, 30 Aug 2004 23:35:23 +0000 (+0000)
Subject: cfgcleanup.c (merge_memattrs): Look at the value of MEM_SIZE, not the pointers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4c0250bb53af139ec25daa3cdf63370d5e7d6de;p=gcc.git

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

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

From-SVN: r86811
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ec3a32fc72..ce84375fcf1 100644
--- 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 91412cf84d5..bfbf4b45649 100644
--- 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)));