backport: sel-sched-ir.c (sel_restore_other_notes): Rename to sel_restore_notes.

Backport from mainline:
 2010-01-14  Alexander Monakov  <amonakov@ispras.ru>

        * sel-sched-ir.c (sel_restore_other_notes): Rename to sel_restore_notes.
        Update all callers.  Call reemit_notes for all insns.

From-SVN: r163514
This commit is contained in:
Andrey Belevantsev 2010-08-24 13:09:36 +04:00 committed by Andrey Belevantsev
parent df2b4d5fa8
commit 9439d0c53e
2 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:
2010-01-14 Alexander Monakov <amonakov@ispras.ru>
* sel-sched-ir.c (sel_restore_other_notes): Rename to sel_restore_notes.
Update all callers. Call reemit_notes for all insns.
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:

View File

@ -4384,11 +4384,12 @@ sel_init_bbs (bb_vec_t bbs, basic_block bb)
sched_scan (&ssi, bbs, bb, new_insns, NULL);
}
/* Restore other notes for the whole region. */
/* Restore notes for the whole region. */
static void
sel_restore_other_notes (void)
sel_restore_notes (void)
{
int bb;
insn_t insn;
for (bb = 0; bb < current_nr_blocks; bb++)
{
@ -4403,6 +4404,10 @@ sel_restore_other_notes (void)
restore_other_notes (NULL, first);
BB_NOTE_LIST (first) = NULL_RTX;
FOR_BB_INSNS (first, insn)
if (INSN_P (insn))
reemit_notes (insn);
first = first->next_bb;
}
while (first != last);
@ -4413,7 +4418,7 @@ sel_restore_other_notes (void)
void
sel_finish_bbs (void)
{
sel_restore_other_notes ();
sel_restore_notes ();
/* Remove current loop preheader from this loop. */
if (current_loop_nest)