[PATCH 01/25] use rtx_insn * as the type of a local variable in mode-switching.c

[PATCH 01/25] use rtx_insn * as the type of a local variable in mode-switching.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* mode-switching.c (commit_mode_sets): Change type of local
	variable from rtx to rtx_insn *.
---
 gcc/ChangeLog        | 5 +++++
 gcc/mode-switching.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77d9352..54297f2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* mode-switching.c (commit_mode_sets): Change type of local
+	variable from rtx to rtx_insn *.
+
 2015-05-08  Jim Wilson  <jim.wilson@linaro.org>
 
 	* doc/install.texi (--enable-languages): Add missing jit and lto info.
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index c0f865c..dd28a3e 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -131,7 +131,7 @@ commit_mode_sets (struct edge_list *edge_list, int e, struct bb_info *info)
 	  HARD_REG_SET live_at_edge;
 	  basic_block src_bb = eg->src;
 	  int cur_mode = info[src_bb->index].mode_out;
-	  rtx mode_set;
+	  rtx_insn *mode_set;
 
 	  REG_SET_TO_HARD_REG_SET (live_at_edge, df_get_live_out (src_bb));
 
@@ -145,7 +145,7 @@ commit_mode_sets (struct edge_list *edge_list, int e, struct bb_info *info)
 	  default_rtl_profile ();
 
 	  /* Do not bother to insert empty sequence.  */
-	  if (mode_set == NULL_RTX)
+	  if (mode_set == NULL)
 	    continue;
 
 	  /* We should not get an abnormal edge here.  */
-- 
2.4.0.78.g7c6ecbf

[PATCH 03/25] make stop_search_p take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* reorg.c (stop_search_p): Change argument to rtx_insn *.
---
 gcc/ChangeLog | 4 ++++
 gcc/reorg.c   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db7f740..f4b88d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* reorg.c (stop_search_p): Change argument to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* except.c (make_reg_eh_region_note): Change argument to
 	rtx_insn *.
 	(make_reg_eh_region_note_nothrow_nononlocal): Likewise.
diff --git a/gcc/reorg.c b/gcc/reorg.c
index cb251ee..2f7bb43 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -225,7 +225,7 @@ static int *uid_to_ruid;
 /* Highest valid index in `uid_to_ruid'.  */
 static int max_uid;
 
-static int stop_search_p (rtx, int);
+static int stop_search_p (rtx_insn *, int);
 static int resource_conflicts_p (struct resources *, struct resources *);
 static int insn_references_resource_p (rtx, struct resources *, bool);
 static int insn_sets_resource_p (rtx, struct resources *, bool);
@@ -302,7 +302,7 @@ simplejump_or_return_p (rtx insn)
    In all cases, jumps terminate the search.  */
 
 static int
-stop_search_p (rtx insn, int labels_p)
+stop_search_p (rtx_insn *insn, int labels_p)
 {
   if (insn == 0)
     return 1;
-- 
2.4.0.78.g7c6ecbf

[PATCH 00/25] more rtx_insn *ification

[tbsaunde+gcc]

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

Hi,

This series does a bunch more "trivial" changes from rtx to rtx_insn *.

each patch bootstrapped + regtested on x86_64-linux-gnu, and the series was run
through config-list.mk.  I think this all falls within Jeff's preapproval
again, so committing to trunk.

Trev


Trevor Saunders (25):
  use rtx_insn * as the type of a local variable in mode-switching.c
  make make_reg_eh_region_note and friend take rtx_insn *
  make stop_search_p take a rtx_insn *
  change in_expr_list_p to in_insn_list_p
  computed_jump_p takes a rtx_insn *
  can_nonlocal_goto can take a rtx_insn *
  make remove_reg_equal_equiv_notes take an rtx_insn *
  make add_shallow_copy_of_reg_note take an rtx_insn *
  make noop_move_p take a rtx_insn *
  prev_cc0_setter can take a rtx_insn *
  emit_note_after can take a rtx_insn *
  emit_note_before can take a rtx_insn *
  make emit_debug_insn_before take a rtx_insn *
  cse_change_cc0_mode can take a rtx_insn *
  pass rtx_insn * more in gcse.c
  change more argument types to rtx_insn *
  use rtx_insn * more in reorg.c
  more rtx_insn * in recog.c
  notice_args_size can take a rtx_insn *
  more rtx_insn * in sched-deps.c
  find_all_hard_reg_sets can take a rtx_insn *
  rtx_insn * in combine.c
  rtx_insn * in df-problems.c
  setup_next_usage_insn can take a rtx_insn *
  redirect_jump* can take a rtx_insn *

 gcc/ChangeLog          | 127 +++++++++++++++++++++++++++++++++++++++++++++++++
 gcc/cfgrtl.c           |   2 +-
 gcc/combine.c          |   2 +-
 gcc/cse.c              |   2 +-
 gcc/df-problems.c      |   2 +-
 gcc/dwarf2cfi.c        |   2 +-
 gcc/emit-rtl.c         |  12 ++---
 gcc/except.c           |   6 +--
 gcc/except.h           |   4 +-
 gcc/gcse.c             |   8 ++--
 gcc/ira-color.c        |   4 +-
 gcc/ira.c              |   4 +-
 gcc/ira.h              |   2 +-
 gcc/jump.c             |   6 +--
 gcc/lra-constraints.c  |   2 +-
 gcc/lra-eliminations.c |   2 +-
 gcc/mode-switching.c   |   4 +-
 gcc/recog.c            |  30 ++++++------
 gcc/recog.h            |  18 +++----
 gcc/reorg.c            |  14 +++---
 gcc/rtl.h              |  28 +++++------
 gcc/rtlanal.c          |  18 +++----
 gcc/sched-deps.c       |   4 +-
 gcc/sched-int.h        |   4 +-
 24 files changed, 215 insertions(+), 92 deletions(-)

-- 
2.4.0.78.g7c6ecbf

[PATCH 05/25] computed_jump_p takes a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtlanal.c (computed_jump_p): Cange argument type to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog | 5 +++++
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 94783f8..632a283 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtlanal.c (computed_jump_p): Cange argument type to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p.
 	* cfgrtl.c (can_delete_label_p): Adjust.
 	* rtl.h: likewise.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 6b01dd7..2795d5a 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2890,7 +2890,7 @@ extern void replace_label (rtx *, rtx, rtx, bool);
 extern void replace_label_in_insn (rtx_insn *, rtx, rtx, bool);
 extern bool rtx_referenced_p (const_rtx, const_rtx);
 extern bool tablejump_p (const rtx_insn *, rtx *, rtx_jump_table_data **);
-extern int computed_jump_p (const_rtx);
+extern int computed_jump_p (const rtx_insn *);
 extern bool tls_referenced_p (const_rtx);
 
 /* Overload for refers_to_regno_p for checking a single register.  */
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index b531010..8c9b01d 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2990,7 +2990,7 @@ computed_jump_p_1 (const_rtx x)
    we can recognize them by a (use (label_ref)).  */
 
 int
-computed_jump_p (const_rtx insn)
+computed_jump_p (const rtx_insn *insn)
 {
   int i;
   if (JUMP_P (insn))
-- 
2.4.0.78.g7c6ecbf

[PATCH 19/25] notice_args_size can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* dwarf2cfi.c: Change argument type to rtx_insn *.
---
 gcc/ChangeLog   | 4 ++++
 gcc/dwarf2cfi.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e08209e..6804c36 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* dwarf2cfi.c: Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* ira.c (decrease_live_ranges_number): Changetype of local
 	variable to rtx_insn *.
 	* recog.c: Change argument types to rtx_insn *.
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 7bcbd6c..1e0594d 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -920,7 +920,7 @@ reg_save (unsigned int reg, unsigned int sreg, HOST_WIDE_INT offset)
    and adjust data structures to match.  */
 
 static void
-notice_args_size (rtx insn)
+notice_args_size (rtx_insn *insn)
 {
   HOST_WIDE_INT args_size, delta;
   rtx note;
-- 
2.4.0.78.g7c6ecbf

[PATCH 14/25] cse_change_cc0_mode can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* cse.c (cse_change_cc0_mode): Change argument type to rtx_insn *.
---
 gcc/ChangeLog | 4 ++++
 gcc/cse.c     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b59146f..a595d23 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* cse.c (cse_change_cc0_mode): Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* emit-rtl.c (emit_debug_insn_before): Change argument type to
 	rtx_insn *.
 	* rtl.h: Adjust.
diff --git a/gcc/cse.c b/gcc/cse.c
index 15eb33e..fcfcd3d 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -7131,7 +7131,7 @@ delete_trivially_dead_insns (rtx_insn *insns, int nreg)
 
 static void
 cse_change_cc_mode (subrtx_ptr_iterator::array_type &array,
-		    rtx *loc, rtx insn, rtx newreg)
+		    rtx *loc, rtx_insn *insn, rtx newreg)
 {
   FOR_EACH_SUBRTX_PTR (iter, array, loc, NONCONST)
     {
-- 
2.4.0.78.g7c6ecbf

[PATCH 09/25] make noop_move_p take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtlanal.c (noop_move_p): Change argument type to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog | 5 +++++
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d519861..f121a30 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtlanal.c (noop_move_p): Change argument type to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtlanal.c (add_shallow_copy_of_reg_note): Change argument type
 	to rtx_insn *.
 	* rtl.h: Adjust.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 82ed3b3..870559b 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2844,7 +2844,7 @@ extern int modified_in_p (const_rtx, const_rtx);
 extern int reg_set_p (const_rtx, const_rtx);
 extern int multiple_sets (const_rtx);
 extern int set_noop_p (const_rtx);
-extern int noop_move_p (const_rtx);
+extern int noop_move_p (const rtx_insn *);
 extern bool refers_to_regno_p (unsigned int, unsigned int, const_rtx, rtx *);
 extern int reg_overlap_mentioned_p (const_rtx, const_rtx);
 extern const_rtx set_of (const_rtx, const_rtx);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index f1511c4..9760bab 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -1368,7 +1368,7 @@ set_noop_p (const_rtx set)
    value to itself.  */
 
 int
-noop_move_p (const_rtx insn)
+noop_move_p (const rtx_insn *insn)
 {
   rtx pat = PATTERN (insn);
 
-- 
2.4.0.78.g7c6ecbf

[PATCH 18/25] more rtx_insn * in recog.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* ira.c (decrease_live_ranges_number): Changetype of local
	variable to rtx_insn *.
	* recog.c: Change argument types to rtx_insn *.
	* recog.h: Adjust.
---
 gcc/ChangeLog |  7 +++++++
 gcc/ira.c     |  4 ++--
 gcc/recog.c   | 30 +++++++++++++++---------------
 gcc/recog.h   | 18 +++++++++---------
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9468f4e..e08209e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* ira.c (decrease_live_ranges_number): Changetype of local
+	variable to rtx_insn *.
+	* recog.c: Change argument types to rtx_insn *.
+	* recog.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* reorg.c: Change argument types to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/ira.c b/gcc/ira.c
index bba26e5..75ea6e0 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -2045,8 +2045,8 @@ decrease_live_ranges_number (void)
 {
   basic_block bb;
   rtx_insn *insn;
-  rtx set, src, dest, dest_death, q, note;
-  rtx_insn *p;
+  rtx set, src, dest, dest_death, note;
+  rtx_insn *p, *q;
   int sregno, dregno;
 
   if (! flag_expensive_optimizations)
diff --git a/gcc/recog.c b/gcc/recog.c
index a43055e..d933364 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -84,9 +84,9 @@ along with GCC; see the file COPYING3.  If not see
 #endif
 #endif
 
-static void validate_replace_rtx_1 (rtx *, rtx, rtx, rtx, bool);
+static void validate_replace_rtx_1 (rtx *, rtx, rtx, rtx_insn *, bool);
 static void validate_replace_src_1 (rtx *, void *);
-static rtx split_insn (rtx_insn *);
+static rtx_insn *split_insn (rtx_insn *);
 
 struct target_recog default_target_recog;
 #if SWITCHABLE_TARGET
@@ -319,7 +319,7 @@ validate_unshare_change (rtx object, rtx *loc, rtx new_rtx, bool in_group)
 
    Return true if anything was changed.  */
 bool
-canonicalize_change_group (rtx insn, rtx x)
+canonicalize_change_group (rtx_insn *insn, rtx x)
 {
   if (COMMUTATIVE_P (x)
       && swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1)))
@@ -598,7 +598,7 @@ cancel_changes (int num)
    rtx.  */
 
 static void
-simplify_while_replacing (rtx *loc, rtx to, rtx object,
+simplify_while_replacing (rtx *loc, rtx to, rtx_insn *object,
                           machine_mode op0_mode)
 {
   rtx x = *loc;
@@ -758,7 +758,7 @@ simplify_while_replacing (rtx *loc, rtx to, rtx object,
    validate_change passing OBJECT.  */
 
 static void
-validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx object,
+validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx_insn *object,
                         bool simplify)
 {
   int i, j;
@@ -847,7 +847,7 @@ validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx object,
    if INSN is still valid.  */
 
 int
-validate_replace_rtx_subexp (rtx from, rtx to, rtx insn, rtx *loc)
+validate_replace_rtx_subexp (rtx from, rtx to, rtx_insn *insn, rtx *loc)
 {
   validate_replace_rtx_1 (loc, from, to, insn, true);
   return apply_change_group ();
@@ -857,7 +857,7 @@ validate_replace_rtx_subexp (rtx from, rtx to, rtx insn, rtx *loc)
    changes have been made, validate by seeing if INSN is still valid.  */
 
 int
-validate_replace_rtx (rtx from, rtx to, rtx insn)
+validate_replace_rtx (rtx from, rtx to, rtx_insn *insn)
 {
   validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true);
   return apply_change_group ();
@@ -870,7 +870,7 @@ validate_replace_rtx (rtx from, rtx to, rtx insn)
    validate_replace_rtx_part (from, to, &PATTERN (insn), insn).  */
 
 int
-validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx insn)
+validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx_insn *insn)
 {
   validate_replace_rtx_1 (where, from, to, insn, true);
   return apply_change_group ();
@@ -879,7 +879,7 @@ validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx insn)
 /* Same as above, but do not simplify rtx afterwards.  */
 int
 validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where,
-                                      rtx insn)
+				      rtx_insn *insn)
 {
   validate_replace_rtx_1 (where, from, to, insn, false);
   return apply_change_group ();
@@ -890,7 +890,7 @@ validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where,
    will replace in REG_EQUAL and REG_EQUIV notes.  */
 
 void
-validate_replace_rtx_group (rtx from, rtx to, rtx insn)
+validate_replace_rtx_group (rtx from, rtx to, rtx_insn *insn)
 {
   rtx note;
   validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true);
@@ -936,7 +936,7 @@ validate_replace_src_group (rtx from, rtx to, rtx_insn *insn)
    pattern and return true if something was simplified.  */
 
 bool
-validate_simplify_insn (rtx insn)
+validate_simplify_insn (rtx_insn *insn)
 {
   int i;
   rtx pat = NULL;
@@ -976,7 +976,7 @@ validate_simplify_insn (rtx insn)
    EQ and NE tests do not count.  */
 
 int
-next_insn_tests_no_inequality (rtx insn)
+next_insn_tests_no_inequality (rtx_insn *insn)
 {
   rtx_insn *next = next_cc0_user (insn);
 
@@ -2517,7 +2517,7 @@ preprocess_insn_constraints (int icode)
    The collected data is stored in recog_op_alt.  */
 
 void
-preprocess_constraints (rtx insn)
+preprocess_constraints (rtx_insn *insn)
 {
   int icode = INSN_CODE (insn);
   if (icode >= 0)
@@ -2911,7 +2911,7 @@ reg_fits_class_p (const_rtx operand, reg_class_t cl, int offset,
    split_all_insns_noflow.  Return last insn in the sequence if successful,
    or NULL if unsuccessful.  */
 
-static rtx
+static rtx_insn *
 split_insn (rtx_insn *insn)
 {
   /* Split insns here to get max fine-grain parallelism.  */
@@ -2920,7 +2920,7 @@ split_insn (rtx_insn *insn)
   rtx insn_set, last_set, note;
 
   if (last == insn)
-    return NULL_RTX;
+    return NULL;
 
   /* If the original instruction was a single set that was known to be
      equivalent to a constant, see if we can say the same about the last
diff --git a/gcc/recog.h b/gcc/recog.h
index 7d929ec..463c748 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -88,7 +88,7 @@ extern int check_asm_operands (rtx);
 extern int asm_operand_ok (rtx, const char *, const char **);
 extern bool validate_change (rtx, rtx *, rtx, bool);
 extern bool validate_unshare_change (rtx, rtx *, rtx, bool);
-extern bool canonicalize_change_group (rtx insn, rtx x);
+extern bool canonicalize_change_group (rtx_insn *insn, rtx x);
 extern int insn_invalid_p (rtx_insn *, bool);
 extern int verify_changes (int);
 extern void confirm_change_group (void);
@@ -104,15 +104,15 @@ extern int strict_memory_address_addr_space_p (machine_mode, rtx,
 					       addr_space_t);
 #define strict_memory_address_p(mode,addr) \
 	strict_memory_address_addr_space_p ((mode), (addr), ADDR_SPACE_GENERIC)
-extern int validate_replace_rtx_subexp (rtx, rtx, rtx, rtx *);
-extern int validate_replace_rtx (rtx, rtx, rtx);
-extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx);
-extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx);
-extern void validate_replace_rtx_group (rtx, rtx, rtx);
+extern int validate_replace_rtx_subexp (rtx, rtx, rtx_insn *, rtx *);
+extern int validate_replace_rtx (rtx, rtx, rtx_insn *);
+extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx_insn *);
+extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx_insn *);
+extern void validate_replace_rtx_group (rtx, rtx, rtx_insn *);
 extern void validate_replace_src_group (rtx, rtx, rtx_insn *);
-extern bool validate_simplify_insn (rtx insn);
+extern bool validate_simplify_insn (rtx_insn *insn);
 extern int num_changes_pending (void);
-extern int next_insn_tests_no_inequality (rtx);
+extern int next_insn_tests_no_inequality (rtx_insn *);
 extern bool reg_fits_class_p (const_rtx, reg_class_t, int, machine_mode);
 
 extern int offsettable_memref_p (rtx);
@@ -138,7 +138,7 @@ extern void extract_insn_cached (rtx_insn *);
 extern void preprocess_constraints (int, int, const char **,
 				    operand_alternative *);
 extern const operand_alternative *preprocess_insn_constraints (int);
-extern void preprocess_constraints (rtx);
+extern void preprocess_constraints (rtx_insn *);
 extern rtx peep2_next_insn (int);
 extern int peep2_regno_dead_p (int, int);
 extern int peep2_reg_dead_p (int, rtx);
-- 
2.4.0.78.g7c6ecbf

[PATCH 17/25] use rtx_insn * more in reorg.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* reorg.c: Change argument types to rtx_insn *.
---
 gcc/ChangeLog |  4 ++++
 gcc/reorg.c   | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efe4ca0..9468f4e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* reorg.c: Change argument types to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* ira-color.c: Change argument types to rtx_insn *.
 	* lra-eliminations.c: Likewise.
 	* ira.h: Adjust.
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 2f7bb43..4b41f7e 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -186,7 +186,7 @@ skip_consecutive_labels (rtx label_or_return)
    and REG_CC_USER notes so we can find it.  */
 
 static void
-link_cc0_insns (rtx insn)
+link_cc0_insns (rtx_insn *insn)
 {
   rtx user = next_nonnote_insn (insn);
 
@@ -260,12 +260,12 @@ static rtx_insn_list *steal_delay_list_from_fallthrough (rtx_insn *, rtx,
 							 struct resources *,
 							 struct resources *,
 							 int, int *, int *);
-static void try_merge_delay_insns (rtx, rtx_insn *);
+static void try_merge_delay_insns (rtx_insn *, rtx_insn *);
 static rtx redundant_insn (rtx, rtx_insn *, rtx);
 static int own_thread_p (rtx, rtx, int);
 static void update_block (rtx_insn *, rtx);
 static int reorg_redirect_jump (rtx_insn *, rtx);
-static void update_reg_dead_notes (rtx, rtx);
+static void update_reg_dead_notes (rtx_insn *, rtx_insn *);
 static void fix_reg_dead_note (rtx, rtx);
 static void update_reg_unused_notes (rtx, rtx);
 static void fill_simple_delay_slots (int);
@@ -1313,7 +1313,7 @@ steal_delay_list_from_fallthrough (rtx_insn *insn, rtx condition,
    we delete the merged insn.  */
 
 static void
-try_merge_delay_insns (rtx insn, rtx_insn *thread)
+try_merge_delay_insns (rtx_insn *insn, rtx_insn *thread)
 {
   rtx_insn *trial, *next_trial;
   rtx_insn *delay_insn = as_a <rtx_insn *> (XVECEXP (PATTERN (insn), 0, 0));
@@ -1807,7 +1807,7 @@ reorg_redirect_jump (rtx_insn *jump, rtx nlabel)
    is dead because it sees a REG_DEAD note immediately before a CODE_LABEL.  */
 
 static void
-update_reg_dead_notes (rtx insn, rtx delayed_insn)
+update_reg_dead_notes (rtx_insn *insn, rtx_insn *delayed_insn)
 {
   rtx link, next;
   rtx_insn *p;
-- 
2.4.0.78.g7c6ecbf

[PATCH 11/25] emit_note_after can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* emit-rtl.c (emit_note_after): Change argument type to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog  | 5 +++++
 gcc/emit-rtl.c | 3 +--
 gcc/rtl.h      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f97fdc..99ba0f6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* emit-rtl.c (emit_note_after): Change argument type to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* emit-rtl.c (prev_cc0_setter): Change argument type to rtx_insn *.
 	* rtl.h: Adjust.
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index ad5c8b2..2521c77 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4631,9 +4631,8 @@ note_outside_basic_block_p (enum insn_note subtype, bool on_bb_boundary_p)
 /* Emit a note of subtype SUBTYPE after the insn AFTER.  */
 
 rtx_note *
-emit_note_after (enum insn_note subtype, rtx uncast_after)
+emit_note_after (enum insn_note subtype, rtx_insn *after)
 {
-  rtx_insn *after = as_a <rtx_insn *> (uncast_after);
   rtx_note *note = make_note_raw (subtype);
   basic_block bb = BARRIER_P (after) ? NULL : BLOCK_FOR_INSN (after);
   bool on_bb_boundary_p = (bb != NULL && BB_END (bb) == after);
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 35a9fbc..a39cdc5 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2686,7 +2686,7 @@ extern rtx_insn *emit_debug_insn_after_noloc (rtx, rtx);
 extern rtx_insn *emit_debug_insn_after_setloc (rtx, rtx, int);
 extern rtx_barrier *emit_barrier_after (rtx);
 extern rtx_insn *emit_label_after (rtx, rtx_insn *);
-extern rtx_note *emit_note_after (enum insn_note, rtx);
+extern rtx_note *emit_note_after (enum insn_note, rtx_insn *);
 extern rtx_insn *emit_insn (rtx);
 extern rtx_insn *emit_debug_insn (rtx);
 extern rtx_insn *emit_jump_insn (rtx);
-- 
2.4.0.78.g7c6ecbf

[PATCH 07/25] make remove_reg_equal_equiv_notes take an rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtlanal.c (remove_reg_equal_equiv_notes): Change argument type
	to rtx_insn *.
	* rtl.h: Likewise.
---
 gcc/ChangeLog | 6 ++++++
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a95b674..c9b517fe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtlanal.c (remove_reg_equal_equiv_notes): Change argument type
+	to rtx_insn *.
+	* rtl.h: Likewise.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* except.c (can_nonlocal_goto): Change type of argument to
 	rtx_insn *.
 	* rtl.h: Adjust.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 71c000b..1e161f7 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2869,7 +2869,7 @@ extern void add_reg_note (rtx, enum reg_note, rtx);
 extern void add_int_reg_note (rtx, enum reg_note, int);
 extern void add_shallow_copy_of_reg_note (rtx, rtx);
 extern void remove_note (rtx, const_rtx);
-extern void remove_reg_equal_equiv_notes (rtx);
+extern void remove_reg_equal_equiv_notes (rtx_insn *);
 extern void remove_reg_equal_equiv_notes_for_regno (unsigned int);
 extern int side_effects_p (const_rtx);
 extern int volatile_refs_p (const_rtx);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 8c9b01d..1a69424 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2159,7 +2159,7 @@ remove_note (rtx insn, const_rtx note)
 /* Remove REG_EQUAL and/or REG_EQUIV notes if INSN has such notes.  */
 
 void
-remove_reg_equal_equiv_notes (rtx insn)
+remove_reg_equal_equiv_notes (rtx_insn *insn)
 {
   rtx *loc;
 
-- 
2.4.0.78.g7c6ecbf

[PATCH 15/25] pass rtx_insn * more in gcse.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* gcse.c: Change argument types to rtx_insn *.
---
 gcc/ChangeLog | 4 ++++
 gcc/gcse.c    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a595d23..598510c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* gcse.c: Change argument types to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* cse.c (cse_change_cc0_mode): Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/gcse.c b/gcc/gcse.c
index d9c5106..92c6014 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -493,7 +493,7 @@ static int oprs_available_p (const_rtx, const rtx_insn *);
 static void insert_expr_in_table (rtx, machine_mode, rtx_insn *, int, int,
 				  int, struct gcse_hash_table_d *);
 static unsigned int hash_expr (const_rtx, machine_mode, int *, int);
-static void record_last_reg_set_info (rtx, int);
+static void record_last_reg_set_info (rtx_insn *, int);
 static void record_last_mem_set_info (rtx_insn *);
 static void record_last_set_info (rtx, const_rtx, void *);
 static void compute_hash_table (struct gcse_hash_table_d *);
@@ -516,7 +516,7 @@ static void pre_insert_copies (void);
 static int pre_delete (void);
 static int pre_gcse (struct edge_list *);
 static int one_pre_gcse_pass (void);
-static void add_label_notes (rtx, rtx);
+static void add_label_notes (rtx, rtx_insn *);
 static void alloc_code_hoist_mem (int, int);
 static void free_code_hoist_mem (void);
 static void compute_code_hoist_vbeinout (void);
@@ -1471,7 +1471,7 @@ dump_hash_table (FILE *file, const char *name, struct gcse_hash_table_d *table)
    valid, as a quick test to invalidate them.  */
 
 static void
-record_last_reg_set_info (rtx insn, int regno)
+record_last_reg_set_info (rtx_insn *insn, int regno)
 {
   struct reg_avail_info *info = &reg_avail_info[regno];
   int luid = DF_INSN_LUID (insn);
@@ -2665,7 +2665,7 @@ one_pre_gcse_pass (void)
    necessary REG_LABEL_OPERAND and REG_LABEL_TARGET notes.  */
 
 static void
-add_label_notes (rtx x, rtx insn)
+add_label_notes (rtx x, rtx_insn *insn)
 {
   enum rtx_code code = GET_CODE (x);
   int i, j;
-- 
2.4.0.78.g7c6ecbf

[PATCH 08/25] make add_shallow_copy_of_reg_note take an rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtlanal.c (add_shallow_copy_of_reg_note): Change argument type
	to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog | 6 ++++++
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9b517fe..d519861 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtlanal.c (add_shallow_copy_of_reg_note): Change argument type
+	to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtlanal.c (remove_reg_equal_equiv_notes): Change argument type
 	to rtx_insn *.
 	* rtl.h: Likewise.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 1e161f7..82ed3b3 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2867,7 +2867,7 @@ extern int find_regno_fusage (const_rtx, enum rtx_code, unsigned int);
 extern rtx alloc_reg_note (enum reg_note, rtx, rtx);
 extern void add_reg_note (rtx, enum reg_note, rtx);
 extern void add_int_reg_note (rtx, enum reg_note, int);
-extern void add_shallow_copy_of_reg_note (rtx, rtx);
+extern void add_shallow_copy_of_reg_note (rtx_insn *, rtx);
 extern void remove_note (rtx, const_rtx);
 extern void remove_reg_equal_equiv_notes (rtx_insn *);
 extern void remove_reg_equal_equiv_notes_for_regno (unsigned int);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 1a69424..f1511c4 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2117,7 +2117,7 @@ add_int_reg_note (rtx insn, enum reg_note kind, int datum)
 /* Add a register note like NOTE to INSN.  */
 
 void
-add_shallow_copy_of_reg_note (rtx insn, rtx note)
+add_shallow_copy_of_reg_note (rtx_insn *insn, rtx note)
 {
   if (GET_CODE (note) == INT_LIST)
     add_int_reg_note (insn, REG_NOTE_KIND (note), XINT (note, 0));
-- 
2.4.0.78.g7c6ecbf

[PATCH 12/25] emit_note_before can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* emit-rtl.c (emit_note_before): Change argument type to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog  | 5 +++++
 gcc/emit-rtl.c | 3 +--
 gcc/rtl.h      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99ba0f6..b928d40 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* emit-rtl.c (emit_note_before): Change argument type to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* emit-rtl.c (emit_note_after): Change argument type to rtx_insn *.
 	* rtl.h: Adjust.
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 2521c77..6e70c58 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4647,9 +4647,8 @@ emit_note_after (enum insn_note subtype, rtx_insn *after)
 /* Emit a note of subtype SUBTYPE before the insn BEFORE.  */
 
 rtx_note *
-emit_note_before (enum insn_note subtype, rtx uncast_before)
+emit_note_before (enum insn_note subtype, rtx_insn *before)
 {
-  rtx_insn *before = as_a <rtx_insn *> (uncast_before);
   rtx_note *note = make_note_raw (subtype);
   basic_block bb = BARRIER_P (before) ? NULL : BLOCK_FOR_INSN (before);
   bool on_bb_boundary_p = (bb != NULL && BB_HEAD (bb) == before);
diff --git a/gcc/rtl.h b/gcc/rtl.h
index a39cdc5..ee3ecca 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2671,7 +2671,7 @@ extern rtx_insn *emit_debug_insn_before_noloc (rtx, rtx);
 extern rtx_insn *emit_debug_insn_before_setloc (rtx, rtx, int);
 extern rtx_barrier *emit_barrier_before (rtx);
 extern rtx_insn *emit_label_before (rtx, rtx_insn *);
-extern rtx_note *emit_note_before (enum insn_note, rtx);
+extern rtx_note *emit_note_before (enum insn_note, rtx_insn *);
 extern rtx_insn *emit_insn_after (rtx, rtx);
 extern rtx_insn *emit_insn_after_noloc (rtx, rtx, basic_block);
 extern rtx_insn *emit_insn_after_setloc (rtx, rtx, int);
-- 
2.4.0.78.g7c6ecbf

[PATCH 21/25] find_all_hard_reg_sets can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtl.h: Adjust.
	* rtlanal.c: Change argument type to rtx_insn *.
---
 gcc/ChangeLog | 5 +++++
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b077c82..6811ea1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtl.h: Adjust.
+	* rtlanal.c: Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* sched-deps.c: Change argument types to rtx_insn *.
 	* sched-int.h: Adjust.
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 80c0e5c..dbb5ca2 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2852,7 +2852,7 @@ extern void record_hard_reg_sets (rtx, const_rtx, void *);
 extern void record_hard_reg_uses (rtx *, void *);
 #ifdef HARD_CONST
 extern void find_all_hard_regs (const_rtx, HARD_REG_SET *);
-extern void find_all_hard_reg_sets (const_rtx, HARD_REG_SET *, bool);
+extern void find_all_hard_reg_sets (const rtx_insn *, HARD_REG_SET *, bool);
 #endif
 extern void note_stores (const_rtx, void (*) (rtx, const_rtx, void *), void *);
 extern void note_uses (rtx *, void (*) (rtx *, void *), void *);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 9760bab..00d9080 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -1197,7 +1197,7 @@ record_hard_reg_sets (rtx x, const_rtx pat ATTRIBUTE_UNUSED, void *data)
 /* Examine INSN, and compute the set of hard registers written by it.
    Store it in *PSET.  Should only be called after reload.  */
 void
-find_all_hard_reg_sets (const_rtx insn, HARD_REG_SET *pset, bool implicit)
+find_all_hard_reg_sets (const rtx_insn *insn, HARD_REG_SET *pset, bool implicit)
 {
   rtx link;
 
-- 
2.4.0.78.g7c6ecbf

[PATCH 13/25] make emit_debug_insn_before take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* emit-rtl.c (emit_debug_insn_before): Change argument type to
	rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog  | 6 ++++++
 gcc/emit-rtl.c | 2 +-
 gcc/rtl.h      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b928d40..b59146f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* emit-rtl.c (emit_debug_insn_before): Change argument type to
+	rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* emit-rtl.c (emit_note_before): Change argument type to rtx_insn *.
 	* rtl.h: Adjust.
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 6e70c58..d5e09c2 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4880,7 +4880,7 @@ emit_debug_insn_before_setloc (rtx pattern, rtx before, int loc)
 /* Like emit_debug_insn_before_noloc,
    but set insn_location according to BEFORE.  */
 rtx_insn *
-emit_debug_insn_before (rtx pattern, rtx before)
+emit_debug_insn_before (rtx pattern, rtx_insn *before)
 {
   return emit_pattern_before (pattern, before, false, false,
 			      make_debug_insn_raw);
diff --git a/gcc/rtl.h b/gcc/rtl.h
index ee3ecca..80c0e5c 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2666,7 +2666,7 @@ extern rtx_insn *emit_jump_insn_before_setloc (rtx, rtx_insn *, int);
 extern rtx_insn *emit_call_insn_before (rtx, rtx_insn *);
 extern rtx_insn *emit_call_insn_before_noloc (rtx, rtx_insn *);
 extern rtx_insn *emit_call_insn_before_setloc (rtx, rtx_insn *, int);
-extern rtx_insn *emit_debug_insn_before (rtx, rtx);
+extern rtx_insn *emit_debug_insn_before (rtx, rtx_insn *);
 extern rtx_insn *emit_debug_insn_before_noloc (rtx, rtx);
 extern rtx_insn *emit_debug_insn_before_setloc (rtx, rtx, int);
 extern rtx_barrier *emit_barrier_before (rtx);
-- 
2.4.0.78.g7c6ecbf

[PATCH 02/25] make make_reg_eh_region_note and friend take rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* except.c (make_reg_eh_region_note): Change argument to
	rtx_insn *.
	(make_reg_eh_region_note_nothrow_nononlocal): Likewise.
	* except.h: Adjust.
---
 gcc/ChangeLog | 7 +++++++
 gcc/except.c  | 4 ++--
 gcc/except.h  | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54297f2..db7f740 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* except.c (make_reg_eh_region_note): Change argument to
+	rtx_insn *.
+	(make_reg_eh_region_note_nothrow_nononlocal): Likewise.
+	* except.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* mode-switching.c (commit_mode_sets): Change type of local
 	variable from rtx to rtx_insn *.
 
diff --git a/gcc/except.c b/gcc/except.c
index d609592..e4264bf 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1694,7 +1694,7 @@ for_each_eh_label (void (*callback) (rtx))
   direct call cases) and just pull the data out of the trees.  */
 
 void
-make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr)
+make_reg_eh_region_note (rtx_insn *insn, int ecf_flags, int lp_nr)
 {
   rtx value;
   if (ecf_flags & ECF_NOTHROW)
@@ -1711,7 +1711,7 @@ make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr)
    already exists.  */
 
 void
-make_reg_eh_region_note_nothrow_nononlocal (rtx insn)
+make_reg_eh_region_note_nothrow_nononlocal (rtx_insn *insn)
 {
   rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
   rtx intmin = GEN_INT (INT_MIN);
diff --git a/gcc/except.h b/gcc/except.h
index eb81203..504b4bd 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -270,8 +270,8 @@ extern eh_region get_eh_region_from_lp_number (int);
 
 extern eh_region eh_region_outermost (struct function *, eh_region, eh_region);
 
-extern void make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr);
-extern void make_reg_eh_region_note_nothrow_nononlocal (rtx);
+extern void make_reg_eh_region_note (rtx_insn *insn, int ecf_flags, int lp_nr);
+extern void make_reg_eh_region_note_nothrow_nononlocal (rtx_insn *);
 
 extern void verify_eh_tree (struct function *);
 extern void dump_eh_tree (FILE *, struct function *);
-- 
2.4.0.78.g7c6ecbf

[PATCH 06/25] can_nonlocal_goto can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* except.c (can_nonlocal_goto): Change type of argument to
	rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog | 6 ++++++
 gcc/except.c  | 2 +-
 gcc/rtl.h     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 632a283..a95b674 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* except.c (can_nonlocal_goto): Change type of argument to
+	rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtlanal.c (computed_jump_p): Cange argument type to rtx_insn *.
 	* rtl.h: Adjust.
 
diff --git a/gcc/except.c b/gcc/except.c
index e4264bf..770ab98 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1941,7 +1941,7 @@ insn_nothrow_p (const_rtx insn)
 /* ??? This test is here in this file because it (ab)uses REG_EH_REGION.  */
 
 bool
-can_nonlocal_goto (const_rtx insn)
+can_nonlocal_goto (const rtx_insn *insn)
 {
   if (nonlocal_goto_handler_labels && CALL_P (insn))
     {
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 2795d5a..71c000b 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2881,7 +2881,7 @@ extern bool can_throw_internal (const_rtx);
 extern bool can_throw_external (const_rtx);
 extern bool insn_could_throw_p (const_rtx);
 extern bool insn_nothrow_p (const_rtx);
-extern bool can_nonlocal_goto (const_rtx);
+extern bool can_nonlocal_goto (const rtx_insn *);
 extern void copy_reg_eh_region_note_forward (rtx, rtx_insn *, rtx);
 extern void copy_reg_eh_region_note_backward (rtx, rtx_insn *, rtx);
 extern int inequality_comparisons_p (const_rtx);
-- 
2.4.0.78.g7c6ecbf

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

[tbsaunde+gcc]

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

gcc/ChangeLog:

2015-05-08  Trevor Saunders  <tbsaunde+gcc@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+gcc@tbsaunde.org>
 
+	* jump.c: Change argument types to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* lra-constraints.c: Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@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

[PATCH 20/25] more rtx_insn * in sched-deps.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* sched-deps.c: Change argument types to rtx_insn *.
	* sched-int.h: Adjust.
---
 gcc/ChangeLog    | 5 +++++
 gcc/sched-deps.c | 4 ++--
 gcc/sched-int.h  | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6804c36..b077c82 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* sched-deps.c: Change argument types to rtx_insn *.
+	* sched-int.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* dwarf2cfi.c: Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index b6130ee..24104e0 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -814,7 +814,7 @@ sd_lists_empty_p (const_rtx insn, sd_list_types_def list_types)
 
 /* Initialize data for INSN.  */
 void
-sd_init_insn (rtx insn)
+sd_init_insn (rtx_insn *insn)
 {
   INSN_HARD_BACK_DEPS (insn) = create_deps_list ();
   INSN_SPEC_BACK_DEPS (insn) = create_deps_list ();
@@ -827,7 +827,7 @@ sd_init_insn (rtx insn)
 
 /* Free data for INSN.  */
 void
-sd_finish_insn (rtx insn)
+sd_finish_insn (rtx_insn *insn)
 {
   /* ??? It would be nice to deallocate dependency caches here.  */
 
diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index c93412e..216cd58 100644
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -1649,8 +1649,8 @@ sd_iterator_next (sd_iterator_def *it_ptr)
 
 extern int sd_lists_size (const_rtx, sd_list_types_def);
 extern bool sd_lists_empty_p (const_rtx, sd_list_types_def);
-extern void sd_init_insn (rtx);
-extern void sd_finish_insn (rtx);
+extern void sd_init_insn (rtx_insn *);
+extern void sd_finish_insn (rtx_insn *);
 extern dep_t sd_find_dep_between (rtx, rtx, bool);
 extern void sd_add_dep (dep_t, bool);
 extern enum DEPS_ADJUST_RESULT sd_add_or_update_dep (dep_t, bool);
-- 
2.4.0.78.g7c6ecbf

[PATCH 04/25] change in_expr_list_p to in_insn_list_p

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p.
	* cfgrtl.c (can_delete_label_p): Adjust.
	* rtl.h: likewise.
---
 gcc/ChangeLog | 6 ++++++
 gcc/cfgrtl.c  | 2 +-
 gcc/rtl.h     | 2 +-
 gcc/rtlanal.c | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f4b88d3..94783f8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p.
+	* cfgrtl.c (can_delete_label_p): Adjust.
+	* rtl.h: likewise.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* reorg.c (stop_search_p): Change argument to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 8a75044..390d718 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -145,7 +145,7 @@ can_delete_label_p (const rtx_code_label *label)
   return (!LABEL_PRESERVE_P (label)
 	  /* User declared labels must be preserved.  */
 	  && LABEL_NAME (label) == 0
-	  && !in_expr_list_p (forced_labels, label));
+	  && !in_insn_list_p (forced_labels, label));
 }
 
 /* Delete INSN by patching it out.  */
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 273e2d5..6b01dd7 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2922,7 +2922,7 @@ extern unsigned hash_rtx_cb (const_rtx, machine_mode, int *, int *,
 
 extern rtx regno_use_in (unsigned int, rtx);
 extern int auto_inc_p (const_rtx);
-extern int in_expr_list_p (const_rtx, const_rtx);
+extern bool in_insn_list_p (const rtx_insn_list *, const rtx_insn *);
 extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **);
 extern void remove_node_from_insn_list (const rtx_insn *, rtx_insn_list **);
 extern int loc_mentioned_in_p (rtx *, const_rtx);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 2377f25a..b531010 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2205,16 +2205,16 @@ remove_reg_equal_equiv_notes_for_regno (unsigned int regno)
    return 1 if it is found.  A simple equality test is used to determine if
    NODE matches.  */
 
-int
-in_expr_list_p (const_rtx listp, const_rtx node)
+bool
+in_insn_list_p (const rtx_insn_list *listp, const rtx_insn *node)
 {
   const_rtx x;
 
   for (x = listp; x; x = XEXP (x, 1))
     if (node == XEXP (x, 0))
-      return 1;
+      return true;
 
-  return 0;
+  return false;
 }
 
 /* Search LISTP (an EXPR_LIST) for an entry whose first operand is NODE and
-- 
2.4.0.78.g7c6ecbf

[PATCH 24/25] setup_next_usage_insn can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* lra-constraints.c: Change argument type to rtx_insn *.
---
 gcc/ChangeLog         | 4 ++++
 gcc/lra-constraints.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96df81c..10434e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* lra-constraints.c: Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* df-problems.c: Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 1088b25..c8de418 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -4531,7 +4531,7 @@ struct usage_insns
 static struct usage_insns *usage_insns;
 
 static void
-setup_next_usage_insn (int regno, rtx insn, int reloads_num, bool after_p)
+setup_next_usage_insn (int regno, rtx_insn *insn, int reloads_num, bool after_p)
 {
   usage_insns[regno].check = curr_usage_insns_check;
   usage_insns[regno].insns = insn;
-- 
2.4.0.78.g7c6ecbf

[PATCH 23/25] rtx_insn * in df-problems.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* df-problems.c: Change argument type to rtx_insn *.
---
 gcc/ChangeLog     | 4 ++++
 gcc/df-problems.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2767cf..96df81c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* df-problems.c: Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* combine.c: Change argument type to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index b9584a8..0e6ab39 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -3597,7 +3597,7 @@ df_simulate_one_insn_forwards (basic_block bb, rtx_insn *insn, bitmap live)
 /* Return an OR of MEMREF_NORMAL or MEMREF_VOLATILE for the MEMs in X.  */
 
 static int
-find_memory (rtx insn)
+find_memory (rtx_insn *insn)
 {
   int flags = 0;
   subrtx_iterator::array_type array;
-- 
2.4.0.78.g7c6ecbf

[PATCH 10/25] prev_cc0_setter can take a rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* emit-rtl.c (prev_cc0_setter): Change argument type to rtx_insn *.
	* rtl.h: Adjust.
---
 gcc/ChangeLog  | 5 +++++
 gcc/emit-rtl.c | 4 +---
 gcc/rtl.h      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f121a30..8f97fdc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* emit-rtl.c (prev_cc0_setter): Change argument type to rtx_insn *.
+	* rtl.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtlanal.c (noop_move_p): Change argument type to rtx_insn *.
 	* rtl.h: Adjust.
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index b48f88b..ad5c8b2 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -3572,10 +3572,8 @@ next_cc0_user (rtx uncast_insn)
    note, it is the previous insn.  */
 
 rtx_insn *
-prev_cc0_setter (rtx uncast_insn)
+prev_cc0_setter (rtx_insn *insn)
 {
-  rtx_insn *insn = safe_as_a <rtx_insn *> (uncast_insn);
-
   rtx note = find_reg_note (insn, REG_CC_SETTER, NULL_RTX);
 
   if (note)
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 870559b..35a9fbc 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2719,7 +2719,7 @@ extern rtx_insn *prev_active_insn (rtx);
 extern rtx_insn *next_active_insn (rtx);
 extern int active_insn_p (const_rtx);
 extern rtx_insn *next_cc0_user (rtx);
-extern rtx_insn *prev_cc0_setter (rtx);
+extern rtx_insn *prev_cc0_setter (rtx_insn *);
 
 /* In emit-rtl.c  */
 extern int insn_line (const rtx_insn *);
-- 
2.4.0.78.g7c6ecbf

[PATCH 22/25] rtx_insn * in combine.c

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* combine.c: Change argument type to rtx_insn *.
---
 gcc/ChangeLog | 4 ++++
 gcc/combine.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6811ea1..b2767cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* combine.c: Change argument type to rtx_insn *.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* rtl.h: Adjust.
 	* rtlanal.c: Change argument type to rtx_insn *.
 
diff --git a/gcc/combine.c b/gcc/combine.c
index b806959..d8ba220 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -554,7 +554,7 @@ target_canonicalize_comparison (enum rtx_code *code, rtx *op0, rtx *op1,
    register.  */
 
 static rtx_insn *
-combine_split_insns (rtx pattern, rtx insn)
+combine_split_insns (rtx pattern, rtx_insn *insn)
 {
   rtx_insn *ret;
   unsigned int nregs;
-- 
2.4.0.78.g7c6ecbf

[PATCH 16/25] change more argument types to rtx_insn *

[tbsaunde+gcc]

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

gcc/ChangeLog:

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

	* ira-color.c: Change argument types to rtx_insn *.
	* lra-eliminations.c: Likewise.
	* ira.h: Adjust.
---
 gcc/ChangeLog          | 6 ++++++
 gcc/ira-color.c        | 4 ++--
 gcc/ira.h              | 2 +-
 gcc/lra-eliminations.c | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 598510c..efe4ca0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* ira-color.c: Change argument types to rtx_insn *.
+	* lra-eliminations.c: Likewise.
+	* ira.h: Adjust.
+
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* gcse.c: Change argument types to rtx_insn *.
 
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 0ed9edd..3faa724 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -4600,7 +4600,7 @@ ira_mark_new_stack_slot (rtx x, int regno, unsigned int total_size)
    CALL_USED_COUNT), and the first hard regno occupied by the
    pseudo-registers (through FIRST_HARD_REGNO).  */
 static int
-calculate_spill_cost (int *regnos, rtx in, rtx out, rtx insn,
+calculate_spill_cost (int *regnos, rtx in, rtx out, rtx_insn *insn,
 		      int *excess_pressure_live_length,
 		      int *nrefs, int *call_used_count, int *first_hard_regno)
 {
@@ -4661,7 +4661,7 @@ calculate_spill_cost (int *regnos, rtx in, rtx out, rtx insn,
    decisions.  */
 bool
 ira_better_spill_reload_regno_p (int *regnos, int *other_regnos,
-				 rtx in, rtx out, rtx insn)
+				 rtx in, rtx out, rtx_insn *insn)
 {
   int cost, other_cost;
   int length, other_length;
diff --git a/gcc/ira.h b/gcc/ira.h
index 1979780..5b52cb1 100644
--- a/gcc/ira.h
+++ b/gcc/ira.h
@@ -201,7 +201,7 @@ extern bool ira_reassign_pseudos (int *, int, HARD_REG_SET, HARD_REG_SET *,
 				  HARD_REG_SET *, bitmap);
 extern rtx ira_reuse_stack_slot (int, unsigned int, unsigned int);
 extern void ira_mark_new_stack_slot (rtx, int, unsigned int);
-extern bool ira_better_spill_reload_regno_p (int *, int *, rtx, rtx, rtx);
+extern bool ira_better_spill_reload_regno_p (int *, int *, rtx, rtx, rtx_insn *);
 extern bool ira_bad_reload_regno (int, rtx, rtx);
 
 extern void ira_adjust_equiv_reg_cost (unsigned, int);
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index acf8c8a..4e5ba22 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -873,7 +873,7 @@ mark_not_eliminable (rtx x, machine_mode mem_mode)
    found elmination offset.  If the note is not found, return NULL.
    Remove the found note.  */
 static rtx
-remove_reg_equal_offset_note (rtx insn, rtx what)
+remove_reg_equal_offset_note (rtx_insn *insn, rtx what)
 {
   rtx link, *link_loc;
 
-- 
2.4.0.78.g7c6ecbf