cfgloopanal.c: Use rtx_insn

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

	* cfgloopanal.c (num_loop_insns): Strengthen local "insn" from
	rtx to rtx_insn *.
	(average_num_loop_insns): Likewise.
	(init_set_costs): Likewise for local "seq".
	(seq_cost): Likewise for param "seq", from const_rtx to const
	rtx_insn *.

From-SVN: r214294

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d33cbe57b2be390c88d2f054467a931fdb3a298..c9cea12d9abdfdecb75a9bfb37a05e7b5edc81f4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+       * cfgloopanal.c (num_loop_insns): Strengthen local "insn" from
+       rtx to rtx_insn *.
+       (average_num_loop_insns): Likewise.
+       (init_set_costs): Likewise for local "seq".
+       (seq_cost): Likewise for param "seq", from const_rtx to const
+       rtx_insn *.
+
 2014-08-21  David Malcolm  <dmalcolm@redhat.com>
 
        * cfgloop.c (loop_exits_from_bb_p): Strengthen local "insn" from

diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index e01b9ccbec4c396ff018fe9ba5a90490ea27afea..7ea1a5f920fe2ec3061ea090cb7c352b65d8d759 100644 (file)
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -174,7 +174,7 @@ num_loop_insns (const struct loop *loop)
 {
   basic_block *bbs, bb;
   unsigned i, ninsns = 0;
-  rtx insn;
+  rtx_insn *insn;
 
   bbs = get_loop_body (loop);
   for (i = 0; i < loop->num_nodes; i++)
@@ -198,7 +198,7 @@ average_num_loop_insns (const struct loop *loop)
 {
   basic_block *bbs, bb;
   unsigned i, binsns, ninsns, ratio;
-  rtx insn;
+  rtx_insn *insn;
 
   ninsns = 0;
   bbs = get_loop_body (loop);
@@ -305,7 +305,7 @@ get_loop_level (const struct loop *loop)
 /* Returns estimate on cost of computing SEQ.  */
 
 static unsigned
-seq_cost (const_rtx seq, bool speed)
+seq_cost (const rtx_insn *seq, bool speed)
 {
   unsigned cost = 0;
   rtx set;
@@ -328,7 +328,7 @@ void
 init_set_costs (void)
 {
   int speed;
-  rtx seq;
+  rtx_insn *seq;
   rtx reg1 = gen_raw_REG (SImode, FIRST_PSEUDO_REGISTER);
   rtx reg2 = gen_raw_REG (SImode, FIRST_PSEUDO_REGISTER + 1);
   rtx addr = gen_raw_REG (Pmode, FIRST_PSEUDO_REGISTER + 2);