From: Alexander Monakov <amonakov@ispras.ru>
Date: Thu, 14 Jan 2010 11:25:25 +0000 (+0300)
Subject: sel-sched-ir.c (sel_restore_other_notes): Rename to sel_restore_notes.
X-Git-Tag: releases/gcc-4.5.0~1225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7898b93b5770c3881bf769a3cec86cc3e0d37fda;p=thirdparty%2Fgcc.git

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

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: r155901
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9b1b32a8da4..4341b94100e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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-01-14  Andrey Belevantsev  <abel@ispras.ru>
 
 	PR rtl-optimization/42246
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 05df3340f520..29ce554c3f14 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -4417,11 +4417,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++)
     {
@@ -4436,6 +4437,10 @@ sel_restore_other_notes (void)
 	  restore_other_notes (NULL, first);
 	  BB_NOTE_LIST (first) = NULL_RTX;
 
+	  FOR_BB_INSNS (first, insn)
+	    if (NONDEBUG_INSN_P (insn))
+	      reemit_notes (insn);
+
           first = first->next_bb;
 	}
       while (first != last);
@@ -4446,7 +4451,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)