From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 26 Aug 2014 19:33:56 +0000 (+0000)
Subject: Use rtx_insn in more places in sel-sched.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a59b40881469ffa642ee743235bd1eb3a3389d8;p=gcc.git

Use rtx_insn in more places in sel-sched.c

gcc/
2014-08-26  David Malcolm  <dmalcolm@redhat.com>

	* sel-sched.c (find_place_for_bookkeeping): Strengthen local "insn"
	from rtx to rtx_insn *.
	(need_nop_to_preserve_insn_bb): Likewise for param "insn".
	(code_motion_path_driver): Likewise for local "last_insn".
	(simplify_changed_insns): Likewise for local "insn".

From-SVN: r214540
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 81f9bd5a9ab..ff88b750fc5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-26  David Malcolm  <dmalcolm@redhat.com>
+
+	* sel-sched.c (find_place_for_bookkeeping): Strengthen local "insn"
+	from rtx to rtx_insn *.
+	(need_nop_to_preserve_insn_bb): Likewise for param "insn".
+	(code_motion_path_driver): Likewise for local "last_insn".
+	(simplify_changed_insns): Likewise for local "insn".
+
 2014-08-26  David Malcolm  <dmalcolm@redhat.com>
 
 	* rtl.h (push_to_sequence): Strengthen param from rtx to
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index c75f9b76f2d..1bbdd355886 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -4716,7 +4716,7 @@ find_place_for_bookkeeping (edge e1, edge e2, fence_t *fence_to_rewind)
 	 removed already.  */
       if (DEBUG_INSN_P (place_to_insert))
 	{
-	  rtx insn = sel_bb_head (book_block);
+	  rtx_insn *insn = sel_bb_head (book_block);
 
 	  while (insn != place_to_insert &&
 		 (DEBUG_INSN_P (insn) || NOTE_P (insn)))
@@ -5960,7 +5960,7 @@ handle_emitting_transformations (rtx_insn *insn, expr_t expr,
    leave a NOP there till the return to fill_insns.  */
 
 static bool
-need_nop_to_preserve_insn_bb (rtx insn)
+need_nop_to_preserve_insn_bb (rtx_insn *insn)
 {
   insn_t bb_head, bb_end, bb_next, in_next;
   basic_block bb = BLOCK_FOR_INSN (insn);
@@ -6638,7 +6638,7 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path,
   if (!expr)
     {
       int res;
-      rtx last_insn = PREV_INSN (insn);
+      rtx_insn *last_insn = PREV_INSN (insn);
       bool added_to_path;
 
       gcc_assert (insn == sel_bb_end (bb));
@@ -7006,7 +7006,7 @@ simplify_changed_insns (void)
   for (i = 0; i < current_nr_blocks; i++)
     {
       basic_block bb = BASIC_BLOCK_FOR_FN (cfun, BB_TO_BLOCK (i));
-      rtx insn;
+      rtx_insn *insn;
 
       FOR_BB_INSNS (bb, insn)
 	if (INSN_P (insn))