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

re PR rtl-optimization/49686 (CFI notes are missed for delayed slot) 

PR debug/49686
	* dwarf2cfi.c (dwarf2out_frame_debug): Don't set cfi_insn here...
	(create_cfi_notes): ... do it here instead.

From-SVN: r176091
This commit is contained in:
Richard Henderson 2011-07-09 12:57:27 -07:00 committed by Richard Henderson
parent dbbb299a30
commit 45fba6d114
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2011-07-09 Richard Henderson <rth@redhat.com>
PR debug/49686
* dwarf2cfi.c (dwarf2out_frame_debug): Don't set cfi_insn here...
(create_cfi_notes): ... do it here instead.
2011-07-09 Jakub Jelinek <jakub@redhat.com>
PR debug/49676

25
gcc/dwarf2cfi.c
View File

@ -2180,17 +2180,6 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
bool handled_one = false;
bool need_flush = false;
/* Remember where we are to insert notes. Do not separate tablejump
insns from their ADDR_DIFF_VEC. Putting the note after the VEC
should be ok. */
if (after_p)
{
if (!tablejump_p (insn, NULL, &cfi_insn))
cfi_insn = insn;
}
else
cfi_insn = PREV_INSN (insn);
if (!NONJUMP_INSN_P (insn) || clobbers_queued_reg_save (insn))
dwarf2out_flush_queued_reg_saves ();
@ -2201,7 +2190,6 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
is still used to save registers. */
if (!ACCUMULATE_OUTGOING_ARGS)
dwarf2out_notice_stack_adjust (insn, after_p);
cfi_insn = NULL;
return;
}
@ -2323,7 +2311,6 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
if (need_flush)
dwarf2out_flush_queued_reg_saves ();
cfi_insn = NULL;
}
/* Examine CFI and return true if a cfi label and set_loc is needed
@ -2432,6 +2419,8 @@ create_cfi_notes (void)
{
rtx pat;
cfi_insn = PREV_INSN (insn);
if (BARRIER_P (insn))
{
dwarf2out_frame_debug (insn, false);
@ -2443,9 +2432,7 @@ create_cfi_notes (void)
switch (NOTE_KIND (insn))
{
case NOTE_INSN_PROLOGUE_END:
cfi_insn = PREV_INSN (insn);
dwarf2out_flush_queued_reg_saves ();
cfi_insn = NULL;
break;
case NOTE_INSN_EPILOGUE_BEG:
@ -2457,7 +2444,6 @@ create_cfi_notes (void)
case NOTE_INSN_CFA_RESTORE_STATE:
cfi_insn = insn;
dwarf2out_frame_debug_restore_state ();
cfi_insn = NULL;
break;
}
continue;
@ -2484,8 +2470,15 @@ create_cfi_notes (void)
|| find_reg_note (insn, REG_CFA_FLUSH_QUEUE, NULL))
dwarf2out_frame_debug (insn, false);
/* Do not separate tablejump insns from their ADDR_DIFF_VEC.
Putting the note after the VEC should be ok. */
if (!tablejump_p (insn, NULL, &cfi_insn))
cfi_insn = insn;
dwarf2out_frame_debug (insn, true);
}
cfi_insn = NULL;
}
/* Determine if we need to save and restore CFI information around this