diff mbox

[037/236] sel_bb_{head|end} return rtx_insn

Message ID 1407345815-14551-38-git-send-email-dmalcolm@redhat.com
State New
Headers show

Commit Message

David Malcolm Aug. 6, 2014, 5:20 p.m. UTC 
gcc/
	* sel-sched-ir.h (exit_insn): Strengthen from rtx to rtx_insn *.
	(sel_bb_head): Strengthen return type insn_t (currently just an
	rtx) to rtx_insn *.
	(sel_bb_end): Likewise.

	* sel-sched-ir.c (exit_insn): Strengthen from rtx to rtx_insn *.
	(sel_bb_head): Strengthen return type and local "head" from
	insn_t (currently just an rtx) to rtx_insn *.
	(sel_bb_end): Likewise for return type.
	(free_nop_and_exit_insns): Replace use of NULL_RTX with NULL when
	working with insn.
---
 gcc/sel-sched-ir.c | 14 +++++++-------
 gcc/sel-sched-ir.h | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

Comments

Jeff Law Aug. 13, 2014, 6 p.m. UTC | #1 
On 08/06/14 11:20, David Malcolm wrote:
> gcc/
> 	* sel-sched-ir.h (exit_insn): Strengthen from rtx to rtx_insn *.
> 	(sel_bb_head): Strengthen return type insn_t (currently just an
> 	rtx) to rtx_insn *.
> 	(sel_bb_end): Likewise.
>
> 	* sel-sched-ir.c (exit_insn): Strengthen from rtx to rtx_insn *.
> 	(sel_bb_head): Strengthen return type and local "head" from
> 	insn_t (currently just an rtx) to rtx_insn *.
> 	(sel_bb_end): Likewise for return type.
> 	(free_nop_and_exit_insns): Replace use of NULL_RTX with NULL when
> 	working with insn.
OK.
Jeff
David Malcolm Aug. 21, 2014, 12:05 a.m. UTC | #2 
On Wed, 2014-08-13 at 12:00 -0600, Jeff Law wrote:
> On 08/06/14 11:20, David Malcolm wrote:
> > gcc/
> > 	* sel-sched-ir.h (exit_insn): Strengthen from rtx to rtx_insn *.
> > 	(sel_bb_head): Strengthen return type insn_t (currently just an
> > 	rtx) to rtx_insn *.
> > 	(sel_bb_end): Likewise.
> >
> > 	* sel-sched-ir.c (exit_insn): Strengthen from rtx to rtx_insn *.
> > 	(sel_bb_head): Strengthen return type and local "head" from
> > 	insn_t (currently just an rtx) to rtx_insn *.
> > 	(sel_bb_end): Likewise for return type.
> > 	(free_nop_and_exit_insns): Replace use of NULL_RTX with NULL when
> > 	working with insn.
> OK.
Thanks; committed to trunk as r214247.
diff mbox

Patch

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index d7352b7..43569ee 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -132,7 +132,7 @@  static vec<rtx_note *> bb_note_pool;
 rtx nop_pattern = NULL_RTX;
 /* A special instruction that resides in EXIT_BLOCK.
    EXIT_INSN is successor of the insns that lead to EXIT_BLOCK.  */
-rtx exit_insn = NULL_RTX;
+rtx_insn *exit_insn = NULL;
 
 /* TRUE if while scheduling current region, which is loop, its preheader
    was removed.  */
@@ -4535,10 +4535,10 @@  static struct
 /* Functions to work with control-flow graph.  */
 
 /* Return basic block note of BB.  */
-insn_t
+rtx_insn *
 sel_bb_head (basic_block bb)
 {
-  insn_t head;
+  rtx_insn *head;
 
   if (bb == EXIT_BLOCK_PTR_FOR_FN (cfun))
     {
@@ -4553,7 +4553,7 @@  sel_bb_head (basic_block bb)
       head = next_nonnote_insn (note);
 
       if (head && (BARRIER_P (head) || BLOCK_FOR_INSN (head) != bb))
-	head = NULL_RTX;
+	head = NULL;
     }
 
   return head;
@@ -4567,11 +4567,11 @@  sel_bb_head_p (insn_t insn)
 }
 
 /* Return last insn of BB.  */
-insn_t
+rtx_insn *
 sel_bb_end (basic_block bb)
 {
   if (sel_bb_empty_p (bb))
-    return NULL_RTX;
+    return NULL;
 
   gcc_assert (bb != EXIT_BLOCK_PTR_FOR_FN (cfun));
 
@@ -5858,7 +5858,7 @@  setup_nop_and_exit_insns (void)
 void
 free_nop_and_exit_insns (void)
 {
-  exit_insn = NULL_RTX;
+  exit_insn = NULL;
   nop_pattern = NULL_RTX;
 }
 
diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index ab1f42f..16e7806 100644
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -809,7 +809,7 @@  extern flist_t fences;
 extern rtx nop_pattern;
 
 /* An insn that 'contained' in EXIT block.  */
-extern rtx exit_insn;
+extern rtx_insn *exit_insn;
 
 /* Provide a separate luid for the insn.  */
 #define INSN_INIT_TODO_LUID (1)
@@ -1012,8 +1012,8 @@  struct succs_info
 /* Some needed definitions.  */
 extern basic_block after_recovery;
 
-extern insn_t sel_bb_head (basic_block);
-extern insn_t sel_bb_end (basic_block);
+extern rtx_insn *sel_bb_head (basic_block);
+extern rtx_insn *sel_bb_end (basic_block);
 extern bool sel_bb_empty_p (basic_block);
 extern bool in_current_region_p (basic_block);
 
@@ -1583,9 +1583,9 @@  extern bool insn_at_boundary_p (insn_t);
 
 /* Basic block and CFG functions.  */
 
-extern insn_t sel_bb_head (basic_block);
+extern rtx_insn *sel_bb_head (basic_block);
 extern bool sel_bb_head_p (insn_t);
-extern insn_t sel_bb_end (basic_block);
+extern rtx_insn *sel_bb_end (basic_block);
 extern bool sel_bb_end_p (insn_t);
 extern bool sel_bb_empty_p (basic_block);