Strengthen params to active_insn_between

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

	* shrink-wrap.h (active_insn_between): Strengthen both params from
	rtx to rtx_insn *.
	* function.c (active_insn_between): Likewise.

From-SVN: r214704

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 470d0d32152a6526705b0b762c14a1a9ece6d550..83b959a4bcb9fe53f78ac843d93e6341b4352c04 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-28  David Malcolm  <dmalcolm@redhat.com>
+
+       * shrink-wrap.h (active_insn_between): Strengthen both params from
+       rtx to rtx_insn *.
+       * function.c (active_insn_between): Likewise.
+
 2014-08-28  David Malcolm  <dmalcolm@redhat.com>
 
        * genattr.c (main): When writing out insn-attr.h, strengthen param

diff --git a/gcc/function.c b/gcc/function.c
index 54fb9b4b11b05418db621570e4123ed500936728..dc9c06b316606a6086f48e28565ecd1cbcf7f1c8 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5426,9 +5426,8 @@ set_return_jump_label (rtx returnjump)
 #if defined (HAVE_return) || defined (HAVE_simple_return)
 /* Return true if there are any active insns between HEAD and TAIL.  */
 bool
-active_insn_between (rtx head, rtx uncast_tail)
+active_insn_between (rtx_insn *head, rtx_insn *tail)
 {
-  rtx_insn *tail = safe_as_a <rtx_insn *> (uncast_tail);
   while (tail)
     {
       if (active_insn_p (tail))

diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index 647c0769fc9e05dd0053b42d7a3ceb7d5d16cf71..29bdcfd4ef23313d96c9d205ade9be9646c69802 100644 (file)
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -27,7 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifdef HAVE_simple_return
 /* In function.c.  */
 extern void emit_return_into_block (bool simple_p, basic_block bb);
-extern bool active_insn_between (rtx head, rtx tail);
+extern bool active_insn_between (rtx_insn *head, rtx_insn *tail);
 extern vec<edge> convert_jumps_to_returns (basic_block last_bb, bool simple_p,
                                           vec<edge> unconverted);
 extern basic_block emit_return_for_exit (edge exit_fallthru_edge,