[PATCH 036/236] get_last_bb_insn returns an rtx_insn

[David Malcolm]

gcc/
        * basic-block.h (get_last_bb_insn): Strengthen return type from
        rtx to rtx_insn *.
        * cfgrtl.c (get_last_bb_insn): Likewise, and for locals "tmp" and
        end".
---
 gcc/basic-block.h | 2 +-
 gcc/cfgrtl.c      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 03dbdbc..2eb6553 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -828,7 +828,7 @@ extern bool delete_unreachable_blocks (void);
 extern void update_br_prob_note (basic_block);
 extern bool inside_basic_block_p (const_rtx);
 extern bool control_flow_insn_p (const_rtx);
-extern rtx get_last_bb_insn (basic_block);
+extern rtx_insn *get_last_bb_insn (basic_block);
 
 /* In dominance.c */
 
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 5611ab8..e3bad95 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -2238,12 +2238,12 @@ update_br_prob_note (basic_block bb)
 
 /* Get the last insn associated with block BB (that includes barriers and
    tablejumps after BB).  */
-rtx
+rtx_insn *
 get_last_bb_insn (basic_block bb)
 {
   rtx_jump_table_data *table;
-  rtx tmp;
-  rtx end = BB_END (bb);
+  rtx_insn *tmp;
+  rtx_insn *end = BB_END (bb);
 
   /* Include any jump table following the basic block.  */
   if (tablejump_p (end, NULL, &table))
-- 
1.8.5.3