get_last_bb_insn returns an rtx_insn

2014-08-21  David Malcolm  <dmalcolm@redhat.com>

	* 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".

From-SVN: r214246

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03599dfff0e51b4f3241488698fe60c0e7adc434..d4537b552607b5694349a1967668441a7de09897 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+       * 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".
+
 2014-08-21  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
        PR fortran/44054

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 2e494a4995a0f08019fcddf921bdebd67d99d386..e3011da8fe3a4b086d5e6db3025559661f5b1cd3 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -831,7 +831,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 fd94a03eed0e94c76a76b3d75d13712ab5832c9a..ec53f2e752c8e4198a98d9daaa93e776c981332d 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -2237,12 +2237,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))