[PATCH 04/13] recog_data::insn can be a rtx_insn *

[tbsaunde+gcc@tbsaunde.org]

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

gcc/ChangeLog:

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

	* genrecog.c (print_subroutine): Adjust.
	* recog.c (get_bool_attr_mask_uncached): Likewise.
	* recog.h (struct recog_data_d): Change the type of insn to
	rtx_insn *.
---
 gcc/ChangeLog  | 7 +++++++
 gcc/genrecog.c | 2 +-
 gcc/recog.c    | 2 +-
 gcc/recog.h    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05c66a6..e702301 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2015-05-02  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
+	* genrecog.c (print_subroutine): Adjust.
+	* recog.c (get_bool_attr_mask_uncached): Likewise.
+	* recog.h (struct recog_data_d): Change the type of insn to
+	rtx_insn *.
+
+2015-05-02  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
 	* dwarf2cfi.c (add_cfi_insn): Change type to rtx_insn *.
 
 2015-05-02  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 29da094..73e7995 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -5118,7 +5118,7 @@ print_subroutine (output_state *os, state *s, int proc_id)
   print_subroutine_start (os, s, &root_pos);
   if (proc_id == 0)
     {
-      printf ("  recog_data.insn = NULL_RTX;\n");
+      printf ("  recog_data.insn = NULL;\n");
       printf ("  rtx_insn *insn ATTRIBUTE_UNUSED;\n");
       printf ("  insn = safe_as_a <rtx_insn *> (uncast_insn);\n");
     }
diff --git a/gcc/recog.c b/gcc/recog.c
index a5be34c..53d89e0 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -2124,7 +2124,7 @@ get_bool_attr_mask_uncached (rtx_insn *insn, bool_attr attr)
      that the insn operands are already cached.  As above, the attribute
      mustn't depend on the values of operands, so we don't provide their
      real values here.  */
-  rtx old_insn = recog_data.insn;
+  rtx_insn *old_insn = recog_data.insn;
   int old_alternative = which_alternative;
 
   recog_data.insn = insn;
diff --git a/gcc/recog.h b/gcc/recog.h
index 8a38b26..51f2165 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -249,7 +249,7 @@ struct recog_data_d
   bool is_asm;
 
   /* In case we are caching, hold insn data was generated for.  */
-  rtx insn;
+  rtx_insn *insn;
 };
 
 extern struct recog_data_d recog_data;
-- 
2.4.0