From f70c1788f42941f0c414c42a599a83730363e018 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Wed, 27 Aug 2014 19:40:43 +0000 Subject: [PATCH] Convert various INSN accessors in rtl.h to inline functions gcc/ 2014-08-27 David Malcolm * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214586 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/rtl.h | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74767ab1756..eaab05edb71 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2014-08-27 David Malcolm + * 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 + * rtl.h (PATTERN): Convert this macro into a pair of inline functions, for now, requiring const_rtx and rtx. diff --git a/gcc/rtl.h b/gcc/rtl.h index fdf18417032..cd77d87e513 100644 --- 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) ? \ -- 2.11.4.GIT