change more argument types to rtx_insn *

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.

From-SVN: r222950

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 598510c7d30c872616825381be6b85173dca9282..efe4ca051f491ff51cb201df702bc4298c79a76c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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 *.

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 0ed9eddfd907186e4f27c02958af0500fc2cc103..3faa7242372b61bfc873b2f801f876da1dba677c 100644 (file)
--- 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 197978092928c2690ab873c1e86db1c0fc730eba..5b52cb1980c84abf2e8e9c34f6361b7784598526 100644 (file)
--- 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 acf8c8adc11c1cafd71cc28bee45adae9b628cab..4e5ba22e49fc15f19f7ca7273895a4d180f1b14e 100644 (file)
--- 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;