From f695656902c24ec3c56c00020d49097e4d73a761 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 22 Aug 2014 20:19:07 +0000
Subject: [PATCH] reginfo.c: Use rtx_insn (also touches rtl.h)

gcc/
	* rtl.h (reg_scan): Strengthen param "f" from rtx to rtx_insn *.
	* reginfo.c (reg_scan): Likewise, also for local "insn".
	(reg_scan_mark_refs): Likewise for param "insn".
	(init_subregs_of_mode): Likewise for local "insn".

From-SVN: r214367
---
 gcc/ChangeLog |  7 +++++++
 gcc/reginfo.c | 10 +++++-----
 gcc/rtl.h     |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6aeb055b052..ac39cb0302f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-22  David Malcolm  <dmalcolm@redhat.com>
+
+	* rtl.h (reg_scan): Strengthen param "f" from rtx to rtx_insn *.
+	* reginfo.c (reg_scan): Likewise, also for local "insn".
+	(reg_scan_mark_refs): Likewise for param "insn".
+	(init_subregs_of_mode): Likewise for local "insn".
+
 2014-08-22  David Malcolm  <dmalcolm@redhat.com>
 
 	* regcprop.c (struct queued_debug_insn_change): Strengthen field
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index 7668be02dcd..8fd5a68660c 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -1022,12 +1022,12 @@ setup_reg_classes (int regno,
    again just before loop.  It finds the first and last use of each
    pseudo-register.  */
 
-static void reg_scan_mark_refs (rtx, rtx);
+static void reg_scan_mark_refs (rtx, rtx_insn *);
 
 void
-reg_scan (rtx f, unsigned int nregs ATTRIBUTE_UNUSED)
+reg_scan (rtx_insn *f, unsigned int nregs ATTRIBUTE_UNUSED)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   timevar_push (TV_REG_SCAN);
 
@@ -1048,7 +1048,7 @@ reg_scan (rtx f, unsigned int nregs ATTRIBUTE_UNUSED)
    We should only record information for REGs with numbers
    greater than or equal to MIN_REGNO.  */
 static void
-reg_scan_mark_refs (rtx x, rtx insn)
+reg_scan_mark_refs (rtx x, rtx_insn *insn)
 {
   enum rtx_code code;
   rtx dest;
@@ -1259,7 +1259,7 @@ void
 init_subregs_of_mode (void)
 {
   basic_block bb;
-  rtx insn;
+  rtx_insn *insn;
   bitmap_obstack srom_obstack;
   bitmap subregs_of_mode;
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index aa3f8d0d820..a4b5e10673f 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -3207,7 +3207,7 @@ extern void init_fake_stack_mems (void);
 extern void save_register_info (void);
 extern void init_reg_sets (void);
 extern void regclass (rtx, int);
-extern void reg_scan (rtx, unsigned int);
+extern void reg_scan (rtx_insn *, unsigned int);
 extern void fix_register (const char *, int, int);
 extern bool invalid_mode_change_p (unsigned int, enum reg_class);