diff options
| author | Diego Novillo <dnovillo@google.com> | 2009-04-01 16:17:51 +0000 |
|---|---|---|
| committer | Diego Novillo <dnovillo@google.com> | 2009-04-01 16:17:51 +0000 |
| commit | 9abb03a444723af472d0702011bcd7c28da674dc (patch) | |
| tree | 2a4fa16f3f0f2e277dfc2ab7af8b24d76d048abc /gcc/reload.c | |
| parent | 9fc13e3e9ae86b5c4b2bafddc27ee071f6fdd764 (diff) | |
Merge with mainline @145344.
* configure.ac (ACX_PKGVERSION): Update.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/plugins@145410 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/reload.c')
| -rw-r--r-- | gcc/reload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/reload.c b/gcc/reload.c index 7f982c29be1..3b4c51e8c56 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -1,6 +1,6 @@ /* Search an insn for pseudo regs that must be in hard regs and are not. Copyright (C) 1987, 1988, 1989, 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. @@ -1549,7 +1549,7 @@ push_reload (rtx in, rtx out, rtx *inloc, rtx *outloc, && reg_mentioned_p (XEXP (note, 0), in) /* Check that a former pseudo is valid; see find_dummy_reload. */ && (ORIGINAL_REGNO (XEXP (note, 0)) < FIRST_PSEUDO_REGISTER - || (! bitmap_bit_p (DF_LR_OUT (ENTRY_BLOCK_PTR), + || (! bitmap_bit_p (df_get_live_out (ENTRY_BLOCK_PTR), ORIGINAL_REGNO (XEXP (note, 0))) && hard_regno_nregs[regno][GET_MODE (XEXP (note, 0))] == 1)) && ! refers_to_regno_for_reload_p (regno, @@ -2027,7 +2027,7 @@ find_dummy_reload (rtx real_in, rtx real_out, rtx *inloc, rtx *outloc, can ignore the conflict). We must never introduce writes to such hardregs, as they would clobber the other live pseudo. See PR 20973. */ - || (!bitmap_bit_p (DF_LR_OUT (ENTRY_BLOCK_PTR), + || (!bitmap_bit_p (df_get_live_out (ENTRY_BLOCK_PTR), ORIGINAL_REGNO (in)) /* Similarly, only do this if we can be sure that the death note is still valid. global can assign some hardreg to |