Convert various INSN accessors in rtl.h to inline functions

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

	* rtl.h (INSN_UID): Convert from a macro to a pair of inline
	functions.  Require merely an rtx for now, not an rtx_insn *.
	(BLOCK_FOR_INSN): Likewise.
	(INSN_LOCATION): Likewise.
	(INSN_HAS_LOCATION): Convert from a macro to an inline function.

From-SVN: r214586

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74767ab175665bcf573a6736a6731e9967b6c47a..eaab05edb711ac158c4f538708c1223f4af07567 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-27  David Malcolm  <dmalcolm@redhat.com>
+
+       * rtl.h (INSN_UID): Convert from a macro to a pair of inline
+       functions.  Require merely an rtx for now, not an rtx_insn *.
+       (BLOCK_FOR_INSN): Likewise.
+       (INSN_LOCATION): Likewise.
+       (INSN_HAS_LOCATION): Convert from a macro to an inline function.
+
 2014-08-27  David Malcolm  <dmalcolm@redhat.com>
 
        * rtl.h (PATTERN): Convert this macro into a pair of inline

diff --git a/gcc/rtl.h b/gcc/rtl.h
index fdf184170320f2ed56049e8c11787578d2c9679f..cd77d87e513d78289a4722a18a45ef41f4d2558d 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1172,8 +1172,16 @@ extern void rtl_check_failed_flag (const char *, const_rtx, const char *,
 
 /* Holds a unique number for each insn.
    These are not necessarily sequentially increasing.  */
-#define INSN_UID(INSN) \
-  (RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID", (INSN))->u2.insn_uid)
+inline int INSN_UID (const_rtx insn)
+{
+  return RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID",
+                                   (insn))->u2.insn_uid;
+}
+inline int& INSN_UID (rtx insn)
+{
+  return RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID",
+                                   (insn))->u2.insn_uid;
+}
 
 /* Chain insns together in sequence.  */
 
@@ -1204,7 +1212,15 @@ inline rtx& SET_NEXT_INSN (rtx insn)
   return XEXP (insn, 1);
 }
 
-#define BLOCK_FOR_INSN(INSN) XBBDEF (INSN, 2)
+inline basic_block BLOCK_FOR_INSN (const_rtx insn)
+{
+  return XBBDEF (insn, 2);
+}
+
+inline basic_block& BLOCK_FOR_INSN (rtx insn)
+{
+  return XBBDEF (insn, 2);
+}
 
 /* The body of an insn.  */
 inline rtx PATTERN (const_rtx insn)
@@ -1217,10 +1233,20 @@ inline rtx& PATTERN (rtx insn)
   return XEXP (insn, 3);
 }
 
-#define INSN_LOCATION(INSN) XUINT (INSN, 4)
+inline unsigned int INSN_LOCATION (const_rtx insn)
+{
+  return XUINT (insn, 4);
+}
+
+inline unsigned int& INSN_LOCATION (rtx insn)
+{
+  return XUINT (insn, 4);
+}
 
-#define INSN_HAS_LOCATION(INSN) ((LOCATION_LOCUS (INSN_LOCATION (INSN)))\
-  != UNKNOWN_LOCATION)
+inline bool INSN_HAS_LOCATION (const_rtx insn)
+{
+  return LOCATION_LOCUS (INSN_LOCATION (insn)) != UNKNOWN_LOCATION;
+}
 
 /* LOCATION of an RTX if relevant.  */
 #define RTL_LOCATION(X) (INSN_P (X) ? \