Support location tracking for built-in macro tokens

When a built-in macro is expanded, the location of the token in the
epansion list is the location of the expansion point of the built-in
macro.

This patch creates a virtual location for that token instead,
effectively tracking locations of tokens resulting from built-in macro
tokens.

libcpp/
	* include/line-map.h (line_maps::builtin_location): New data
	member.
	(line_map_init): Add a new parameter to initialize the new
	line_maps::builtin_location data member.
	* line-map.c (linemap_init): Initialize the
	line_maps::builtin_location data member.
	* macro.c (builtin_macro): Create a macro map and track the token
	resulting from the expansion of a built-in macro.
gcc/
	* input.h (is_location_from_builtin_token): New function
	declaration.
	* input.c (is_location_from_builtin_token): New function
	definition.
	* toplev.c (general_init): Tell libcpp what the pre-defined
	spelling location for built-in tokens is.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

From-SVN: r212637
This commit is contained in:
Dodji Seketeli
2014-07-16 10:33:27 +00:00
committed by Dodji Seketeli
parent 185b22783a
commit c468587ac2
8 changed files with 75 additions and 5 deletions
+10 -2
View File
@@ -315,6 +315,10 @@ struct GTY(()) line_maps {
line_map_round_alloc_size_func round_alloc_size;
struct location_adhoc_data_map location_adhoc_data_map;
/* The special location value that is used as spelling location for
built-in tokens. */
source_location builtin_location;
};
/* Returns the pointer to the memory region where information about
@@ -447,8 +451,12 @@ extern source_location get_location_from_adhoc_loc (struct line_maps *,
extern void rebuild_location_adhoc_htab (struct line_maps *);
/* Initialize a line map set. */
extern void linemap_init (struct line_maps *);
/* Initialize a line map set. SET is the line map set to initialize
and BUILTIN_LOCATION is the special location value to be used as
spelling location for built-in tokens. This BUILTIN_LOCATION has
to be strictly less than RESERVED_LOCATION_COUNT. */
extern void linemap_init (struct line_maps *set,
source_location builtin_location);
/* Check for and warn about line_maps entered but not exited. */