diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-21 18:18:52 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-21 18:18:52 +0000 |
commit | fb01523df3d05efe45df14bbc79881baf0d041d2 (patch) | |
tree | a4b8449e349cfd55686663c34eb51b747cc1a22b /gcc/emit-rtl.c | |
parent | 1d2c8bb01eea3eaba001f9a8942576cc8431c1da (diff) | |
download | gcc-fb01523df3d05efe45df14bbc79881baf0d041d2.tar.gz |
2009-01-21 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r143546
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@143548 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/emit-rtl.c')
-rw-r--r-- | gcc/emit-rtl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 830ce1dc910..679e95ea8a2 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1,6 +1,6 @@ /* Emit RTL for the GCC expander. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -2035,6 +2035,11 @@ adjust_address_1 (rtx memref, enum machine_mode mode, HOST_WIDE_INT offset, new_rtx = change_address_1 (memref, mode, addr, validate); + /* If the address is a REG, change_address_1 rightfully returns memref, + but this would destroy memref's MEM_ATTRS. */ + if (new_rtx == memref && offset != 0) + new_rtx = copy_rtx (new_rtx); + /* Compute the new values of the memory attributes due to this adjustment. We add the offsets and update the alignment. */ if (memoffset) |