Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Committed to trunk as r259727.
gcc/ChangeLog:
* input.h (in_system_header_at): Convert from macro to inline
function.
(from_macro_expansion_at): Likewise.
(from_macro_definition_at): Likewise.
---
gcc/input.h | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/gcc/input.h b/gcc/input.h
index 38b45dc..da5451e 100644
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -73,17 +73,31 @@ extern location_t input_location;
Note that this function returns 1 if LOCATION belongs to a token
that is part of a macro replacement-list defined in a system
header, but expanded in a non-system file. */
-#define in_system_header_at(LOC) \
- (linemap_location_in_system_header_p (line_table, LOC))
-/* Return a positive value if LOCATION is the locus of a token that
- comes from a macro expansion, O otherwise. */
-#define from_macro_expansion_at(LOC) \
- ((linemap_location_from_macro_expansion_p (line_table, LOC)))
-/* Return a positive value if LOCATION is the locus of a token that comes from
- a macro definition, O otherwise. This differs from from_macro_expansion_at
+
+static inline int
+in_system_header_at (location_t loc)
+{
+ return linemap_location_in_system_header_p (line_table, loc);
+}
+
+/* Return true if LOCATION is the locus of a token that
+ comes from a macro expansion, false otherwise. */
+
+static inline bool
+from_macro_expansion_at (location_t loc)
+{
+ return linemap_location_from_macro_expansion_p (line_table, loc);
+}
+
+/* Return true if LOCATION is the locus of a token that comes from
+ a macro definition, false otherwise. This differs from
from_macro_expansion_at
in its treatment of macro arguments, for which this returns false. */
-#define from_macro_definition_at(LOC) \
- ((linemap_location_from_macro_definition_p (line_table, LOC)))
+
+static inline bool
+from_macro_definition_at (location_t loc)
+{
+ return linemap_location_from_macro_definition_p (line_table, loc);
+}
static inline location_t
get_pure_location (location_t loc)
--
1.8.5.3
