OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/46515 (Many libjava failures) 

PR middle-end/46515
        * function.c (maybe_copy_prologue_epilogue_insn): Rename from
        maybe_copy_epilogue_insn; handle prologue insns as well.
        * rtl.h, cfglayout.c: Update for rename.
        * recog.c (peep2_attempt): Copy prologue/epilogue data for
        RTX_FRAME_RELATED_P insns.

From-SVN: r166920
This commit is contained in:
Richard Henderson 2010-11-18 13:08:38 -08:00 committed by Richard Henderson
parent df61e411f7
commit cd400280c4
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2010-11-18 Richard Henderson <rth@redhat.com>
PR middle-end/46515
* function.c (maybe_copy_prologue_epilogue_insn): Rename from
maybe_copy_epilogue_insn; handle prologue insns as well.
* rtl.h, cfglayout.c: Update for rename.
* recog.c (peep2_attempt): Copy prologue/epilogue data for
RTX_FRAME_RELATED_P insns.
2010-11-18 Jakub Jelinek <jakub@redhat.com>
PR middle-end/46534

2
gcc/cfglayout.c
View File

@ -1179,7 +1179,7 @@ duplicate_insn_chain (rtx from, rtx to)
|| GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC)
break;
copy = emit_copy_of_insn_after (insn, get_last_insn ());
maybe_copy_epilogue_insn (insn, copy);
maybe_copy_prologue_epilogue_insn (insn, copy);
break;
case CODE_LABEL:

20
gcc/function.c
View File

@ -5140,19 +5140,25 @@ record_insns (rtx insns, rtx end, htab_t *hashp)
}
}
/* INSN has been duplicated as COPY, as part of duping a basic block.
If INSN is an epilogue insn, then record COPY as epilogue as well. */
/* INSN has been duplicated or replaced by as COPY, perhaps by duplicating a
basic block, splitting or peepholes. If INSN is a prologue or epilogue
insn, then record COPY as well. */
void
maybe_copy_epilogue_insn (rtx insn, rtx copy)
maybe_copy_prologue_epilogue_insn (rtx insn, rtx copy)
{
htab_t hash;
void **slot;
if (epilogue_insn_hash == NULL
|| htab_find (epilogue_insn_hash, insn) == NULL)
return;
hash = epilogue_insn_hash;
if (!hash || !htab_find (hash, insn))
{
hash = prologue_insn_hash;
if (!hash || !htab_find (hash, insn))
return;
}
slot = htab_find_slot (epilogue_insn_hash, copy, INSERT);
slot = htab_find_slot (hash, copy, INSERT);
gcc_assert (*slot == NULL);
*slot = copy;
}

4
gcc/recog.c
View File

@ -3219,6 +3219,10 @@ peep2_attempt (basic_block bb, rtx insn, int match_len, rtx attempt)
if (!new_set || !rtx_equal_p (new_set, old_set))
add_reg_note (new_insn, REG_FRAME_RELATED_EXPR, old_set);
}
/* Copy prologue/epilogue status. This is required in order to keep
proper placement of EPILOGUE_BEG and the DW_CFA_remember_state. */
maybe_copy_prologue_epilogue_insn (old_insn, new_insn);
}
/* If we are splitting a CALL_INSN, look for the CALL_INSN

2
gcc/rtl.h
View File

@ -2411,7 +2411,7 @@ extern int prologue_epilogue_contains (const_rtx);
extern int sibcall_epilogue_contains (const_rtx);
extern void mark_temp_addr_taken (rtx);
extern void update_temp_slot_address (rtx, rtx);
extern void maybe_copy_epilogue_insn (rtx, rtx);
extern void maybe_copy_prologue_epilogue_insn (rtx, rtx);
/* In stmt.c */
extern void expand_null_return (void);