Remove VINSN_INSN_RTX scaffolding

gcc/
	* sel-sched-ir.h (struct vinsn_def): Strengthen field "insn_rtx"
	from rtx to rtx_insn *.
        (VINSN_INSN_RTX): Eliminate rvalue function and...
	(SET_VINSN_INSN): ...lvalue function in favor of...
	(VINSN_INSN_RTX): reinstate this old macro.

	* sel-sched-ir.c (vinsn_init): Eliminate use of SET_VINSN_INSN_RTX
	in favor of VINSN_INSN_RTX.
	(VINSN_INSN_RTX): Delete this function.
	(SET_VINSN_INSN_RTX): Likewise.

/
	* rtx-classes-status.txt (TODO): Remove SET_VINSN_INSN_RTX.

From-SVN: r214529

diff --git a/ChangeLog b/ChangeLog
index 337c3a52d354e6654429b39ce7310f705240d91b..4c3e1f1480415d0d1a590b27c72e6fdbf0dab0c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-26  David Malcolm  <dmalcolm@redhat.com>
+
+       * rtx-classes-status.txt (TODO): Remove SET_VINSN_INSN_RTX.
+
 2014-08-26  David Malcolm  <dmalcolm@redhat.com>
 
        * rtx-classes-status.txt (TODO): Remove SET_BND_TO.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d315fac52dea6e0a1c08978960f729b39a56b251..02220a122fd1c98b2b98d7e233fbce46b45fb2b3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2014-08-26  David Malcolm  <dmalcolm@redhat.com>
+
+       * sel-sched-ir.h (struct vinsn_def): Strengthen field "insn_rtx"
+       from rtx to rtx_insn *.
+        (VINSN_INSN_RTX): Eliminate rvalue function and...
+       (SET_VINSN_INSN): ...lvalue function in favor of...
+       (VINSN_INSN_RTX): reinstate this old macro.
+
+       * sel-sched-ir.c (vinsn_init): Eliminate use of SET_VINSN_INSN_RTX
+       in favor of VINSN_INSN_RTX.
+       (VINSN_INSN_RTX): Delete this function.
+       (SET_VINSN_INSN_RTX): Likewise.
+
 2014-08-26  David Malcolm  <dmalcolm@redhat.com>
 
        * sel-sched-ir.h (insn_t): Strengthen from rtx to rtx_insn *.

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 8d699160843fd2b76f2d4d907914ffdbab382d6a..3cc51cb7346ce6411d71f5dbc0fb7c8c4e41c1e9 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -1182,7 +1182,7 @@ vinsn_init (vinsn_t vi, insn_t insn, bool force_unique_p)
   hash_rtx_callback_function hrcf;
   int insn_class;
 
-  SET_VINSN_INSN_RTX (vi) = insn;
+  VINSN_INSN_RTX (vi) = insn;
   VINSN_COUNT (vi) = 0;
   vi->cost = -1;
 
@@ -6449,14 +6449,4 @@ sel_remove_loop_preheader (void)
                               preheader_blocks);
 }
 
-rtx_insn *VINSN_INSN_RTX (vinsn_t vi)
-{
-  return safe_as_a <rtx_insn *> (vi->insn_rtx);
-}
-
-rtx& SET_VINSN_INSN_RTX (vinsn_t vi)
-{
-  return vi->insn_rtx;
-}
-
 #endif

diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index 118e001a56f9e7bb2101afb95879fbb5f14cdfcc..9f1fb6b5263f8089312889e4e07fe0d6b3c5f23e 100644 (file)
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -655,7 +655,7 @@ struct idata_def
 struct vinsn_def
 {
   /* Associated insn.  */
-  rtx insn_rtx;
+  rtx_insn *insn_rtx;
 
   /* Its description.  */
   struct idata_def id;
@@ -677,8 +677,7 @@ struct vinsn_def
   bool may_trap_p;
 };
 
-extern rtx_insn *VINSN_INSN_RTX (vinsn_t);
-extern rtx& SET_VINSN_INSN_RTX (vinsn_t);
+#define VINSN_INSN_RTX(VI) ((VI)->insn_rtx)
 #define VINSN_PATTERN(VI) (PATTERN (VINSN_INSN_RTX (VI)))
 
 #define VINSN_ID(VI) (&((VI)->id))

diff --git a/rtx-classes-status.txt b/rtx-classes-status.txt
index e44e115aaa8a0b69dff3b87525cfe12cd152399e..3d59a8cfc78a42ee6762bb6d9ee3104df0823d0e 100644 (file)
--- a/rtx-classes-status.txt
+++ b/rtx-classes-status.txt
@@ -18,4 +18,3 @@ TODO: "Scaffolding" to be removed
 * SET_BB_HEAD, SET_BB_END, SET_BB_HEADER
 * SET_DEP_PRO, SET_DEP_CON
 * SET_NEXT_INSN, SET_PREV_INSN
-* SET_VINSN_INSN_RTX