diff options
| author | Steven Bosscher <stevenb@suse.de> | 2004-08-30 23:35:23 +0000 |
|---|---|---|
| committer | Steven Bosscher <steven@gcc.gnu.org> | 2004-08-30 23:35:23 +0000 |
| commit | f4c0250bb53af139ec25daa3cdf63370d5e7d6de (patch) | |
| tree | 69df1059790260df2b473ebf4f641c0feb1c92d1 /gcc | |
| parent | da17f5599ef4b9d7e68498a1542091e108413a75 (diff) | |
| download | gcc-f4c0250bb53af139ec25daa3cdf63370d5e7d6de.zip gcc-f4c0250bb53af139ec25daa3cdf63370d5e7d6de.tar.gz gcc-f4c0250bb53af139ec25daa3cdf63370d5e7d6de.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cfgcleanup.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5ec3a32..ce84375f 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 91412cf..bfbf4b4 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))); |