[PATCH 25/25] redirect_jump* can take a rtx_insn *

[tbsaunde+gcc]

From: Trevor Saunders <tbsaunde+...@tbsaunde.org>

gcc/ChangeLog:

2015-05-08  Trevor Saunders  <tbsaunde+...@tbsaunde.org>

        * jump.c: Change argument types to rtx_insn *.
        * rtl.h: Adjust.
---
 gcc/ChangeLog | 5 +++++
 gcc/jump.c    | 6 +++---
 gcc/rtl.h     | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10434e6..04c6856 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+...@tbsaunde.org>
 
+       * jump.c: Change argument types to rtx_insn *.
+       * rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+...@tbsaunde.org>
+
        * lra-constraints.c: Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+...@tbsaunde.org>
diff --git a/gcc/jump.c b/gcc/jump.c
index 513eb6e..a8ab1cc 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1545,7 +1545,7 @@ redirect_exp_1 (rtx *loc, rtx olabel, rtx nlabel, rtx 
insn)
    not see how to do that.  */
 
 int
-redirect_jump_1 (rtx jump, rtx nlabel)
+redirect_jump_1 (rtx_insn *jump, rtx nlabel)
 {
   int ochanges = num_validated_changes ();
   rtx *loc, asmop;
@@ -1580,7 +1580,7 @@ redirect_jump_1 (rtx jump, rtx nlabel)
    (this can only occur when trying to produce return insns).  */
 
 int
-redirect_jump (rtx jump, rtx nlabel, int delete_unused)
+redirect_jump (rtx_insn *jump, rtx nlabel, int delete_unused)
 {
   rtx olabel = JUMP_LABEL (jump);
 
@@ -1612,7 +1612,7 @@ redirect_jump (rtx jump, rtx nlabel, int delete_unused)
    If DELETE_UNUSED is positive, delete related insn to OLABEL if its ref
    count has dropped to zero.  */
 void
-redirect_jump_2 (rtx jump, rtx olabel, rtx nlabel, int delete_unused,
+redirect_jump_2 (rtx_insn *jump, rtx olabel, rtx nlabel, int delete_unused,
                 int invert)
 {
   rtx note;
diff --git a/gcc/rtl.h b/gcc/rtl.h
index dbb5ca2..57a2f13 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -3349,9 +3349,9 @@ extern int invert_jump (rtx_insn *, rtx, int);
 extern int rtx_renumbered_equal_p (const_rtx, const_rtx);
 extern int true_regnum (const_rtx);
 extern unsigned int reg_or_subregno (const_rtx);
-extern int redirect_jump_1 (rtx, rtx);
-extern void redirect_jump_2 (rtx, rtx, rtx, int, int);
-extern int redirect_jump (rtx, rtx, int);
+extern int redirect_jump_1 (rtx_insn *, rtx);
+extern void redirect_jump_2 (rtx_insn *, rtx, rtx, int, int);
+extern int redirect_jump (rtx_insn *, rtx, int);
 extern void rebuild_jump_labels (rtx_insn *);
 extern void rebuild_jump_labels_chain (rtx_insn *);
 extern rtx reversed_comparison (const_rtx, machine_mode);
-- 
2.4.0.78.g7c6ecbf