recog_data::insn can be a rtx_insn *

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 *.

From-SVN: r222733

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05c66a62da2cecbb60ea42794b6ff79d96376d16..e7023015310e64095fc985acba6ee7d9f49414d5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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 *.

diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 29da09483febdac454b9abc73f39f7b37fe6bcc6..73e7995262a626ae3fc1d846856ae0a432b5a690 100644 (file)
--- 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 a5be34c21bd83377f3b13332f1a1ae8617950309..53d89e0a1c83884af8ba2b56539624a0e071922d 100644 (file)
--- 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 8a38b269c47a922e61d6afa8a687e9f5dca04950..51f2165eef99b6da92d2b820ff474e99653f3621 100644 (file)
--- 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;