Convert PATTERN from a macro to a pair of inline functions

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

	* rtl.h (PATTERN): Convert this macro into a pair of inline
	functions, for now, requiring const_rtx and rtx.

From-SVN: r214585

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index adb4c196b165e07b8869fe817e20d051ed0d5def..74767ab175665bcf573a6736a6731e9967b6c47a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-27  David Malcolm  <dmalcolm@redhat.com>
+
+       * rtl.h (PATTERN): Convert this macro into a pair of inline
+       functions, for now, requiring const_rtx and rtx.
+
 2014-08-27  David Malcolm  <dmalcolm@redhat.com>
 
        * target.def (unwind_emit): Strengthen param "insn" from rtx to

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 8d74d366186816aeacf8fb17bdf7ddb400aacf0c..fdf184170320f2ed56049e8c11787578d2c9679f 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1207,7 +1207,15 @@ inline rtx& SET_NEXT_INSN (rtx insn)
 #define BLOCK_FOR_INSN(INSN) XBBDEF (INSN, 2)
 
 /* The body of an insn.  */
-#define PATTERN(INSN)  XEXP (INSN, 3)
+inline rtx PATTERN (const_rtx insn)
+{
+  return XEXP (insn, 3);
+}
+
+inline rtx& PATTERN (rtx insn)
+{
+  return XEXP (insn, 3);
+}
 
 #define INSN_LOCATION(INSN) XUINT (INSN, 4)