diff options
Diffstat (limited to 'libcpp/include/line-map.h')
| -rw-r--r-- | libcpp/include/line-map.h | 386 |
1 files changed, 201 insertions, 185 deletions
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 27aa094c997..5c04945c727 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -125,6 +125,39 @@ typedef void *(*line_map_realloc) (void *, size_t); for a given requested allocation. */ typedef size_t (*line_map_round_alloc_size_func) (size_t); +/* A line_map encodes a sequence of locations. + There are two kinds of maps. Ordinary maps and macro expansion + maps, a.k.a macro maps. + + A macro map encodes source locations of tokens that are part of a + macro replacement-list, at a macro expansion point. E.g, in: + + #define PLUS(A,B) A + B + + No macro map is going to be created there, because we are not at a + macro expansion point. We are at a macro /definition/ point. So the + locations of the tokens of the macro replacement-list (i.e, A + B) + will be locations in an ordinary map, not a macro map. + + On the other hand, if we later do: + + int a = PLUS (1,2); + + The invocation of PLUS here is a macro expansion. So we are at a + macro expansion point. The preprocessor expands PLUS (1,2) and + replaces it with the tokens of its replacement-list: 1 + 2. A macro + map is going to be created to hold (or rather to map, haha ...) the + locations of the tokens 1, + and 2. The macro map also records the + location of the expansion point of PLUS. That location is mapped in + the map that is active right before the location of the invocation + of PLUS. */ +struct GTY((tag ("0"), desc ("%h.reason == LC_ENTER_MACRO ? 2 : 1"))) line_map { + source_location start_location; + + /* The reason for creation of this line map. */ + ENUM_BITFIELD (lc_reason) reason : CHAR_BIT; +}; + /* An ordinary line map encodes physical source locations. Those physical source locations are called "spelling locations". @@ -136,7 +169,7 @@ typedef size_t (*line_map_round_alloc_size_func) (size_t); means "entire file/line" or "unknown line/column" or "not applicable".) The highest possible source location is MAX_SOURCE_LOCATION. */ -struct GTY(()) line_map_ordinary { +struct GTY((tag ("1"))) line_map_ordinary : public line_map { const char *to_file; linenum_type to_line; @@ -164,13 +197,9 @@ struct cpp_hashnode; /* A macro line map encodes location of tokens coming from a macro expansion. - Please note that this struct line_map_macro is a field of struct - line_map below, go read the comments of struct line_map below and - then come back here. - The offset from START_LOCATION is used to index into MACRO_LOCATIONS; this holds the original location of the token. */ -struct GTY(()) line_map_macro { +struct GTY((tag ("2"))) line_map_macro : public line_map { /* The cpp macro which expansion gave birth to this macro map. */ struct cpp_hashnode * GTY ((nested_ptr (union tree_node, "%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL", @@ -243,44 +272,6 @@ struct GTY(()) line_map_macro { source_location expansion; }; -/* A line_map encodes a sequence of locations. - There are two kinds of maps. Ordinary maps and macro expansion - maps, a.k.a macro maps. - - A macro map encodes source locations of tokens that are part of a - macro replacement-list, at a macro expansion point. E.g, in: - - #define PLUS(A,B) A + B - - No macro map is going to be created there, because we are not at a - macro expansion point. We are at a macro /definition/ point. So the - locations of the tokens of the macro replacement-list (i.e, A + B) - will be locations in an ordinary map, not a macro map. - - On the other hand, if we later do: - - int a = PLUS (1,2); - - The invocation of PLUS here is a macro expansion. So we are at a - macro expansion point. The preprocessor expands PLUS (1,2) and - replaces it with the tokens of its replacement-list: 1 + 2. A macro - map is going to be created to hold (or rather to map, haha ...) the - locations of the tokens 1, + and 2. The macro map also records the - location of the expansion point of PLUS. That location is mapped in - the map that is active right before the location of the invocation - of PLUS. */ -struct GTY(()) line_map { - source_location start_location; - - /* The reason for creation of this line map. */ - ENUM_BITFIELD (lc_reason) reason : CHAR_BIT; - - union map_u { - struct line_map_ordinary GTY((tag ("0"))) ordinary; - struct line_map_macro GTY((tag ("1"))) macro; - } GTY((desc ("%1.reason == LC_ENTER_MACRO"))) d; -}; - #if defined ENABLE_CHECKING && (GCC_VERSION >= 2007) /* Assertion macro to be used in line-map code. */ @@ -312,22 +303,44 @@ bool linemap_macro_expansion_map_p (const struct line_map *); /* Assert that MAP encodes locations of tokens that are not part of - the replacement-list of a macro expansion. */ -inline struct line_map * + the replacement-list of a macro expansion, downcasting from + line_map * to line_map_ordinary *. */ + +inline line_map_ordinary * linemap_check_ordinary (struct line_map *map) { linemap_assert (!linemap_macro_expansion_map_p (map)); - return map; + return (line_map_ordinary *)map; } /* Assert that MAP encodes locations of tokens that are not part of - the replacement-list of a macro expansion. */ + the replacement-list of a macro expansion, downcasting from + const line_map * to const line_map_ordinary *. */ -inline const struct line_map * +inline const line_map_ordinary * linemap_check_ordinary (const struct line_map *map) { linemap_assert (!linemap_macro_expansion_map_p (map)); - return map; + return (const line_map_ordinary *)map; +} + +/* Assert that MAP is a macro expansion and downcast to the appropriate + subclass. */ + +inline line_map_macro *linemap_check_macro (line_map *map) +{ + linemap_assert (linemap_macro_expansion_map_p (map)); + return (line_map_macro *)map; +} + +/* Assert that MAP is a macro expansion and downcast to the appropriate + subclass. */ + +inline const line_map_macro * +linemap_check_macro (const line_map *map) +{ + linemap_assert (linemap_macro_expansion_map_p (map)); + return (const line_map_macro *)map; } /* Read the start location of MAP, as an rvalue. */ @@ -350,18 +363,18 @@ MAP_START_LOCATION (line_map *map) /* Get the starting line number of ordinary map MAP. */ inline linenum_type -ORDINARY_MAP_STARTING_LINE_NUMBER (const line_map *map) +ORDINARY_MAP_STARTING_LINE_NUMBER (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_line; + return ord_map->to_line; } /* Access the starting line number of ordinary map MAP by reference (e.g. as an lvalue). */ inline linenum_type& -ORDINARY_MAP_STARTING_LINE_NUMBER (line_map *map) +ORDINARY_MAP_STARTING_LINE_NUMBER (line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_line; + return ord_map->to_line; } /* Get the index of the ordinary map at whose end @@ -370,17 +383,17 @@ ORDINARY_MAP_STARTING_LINE_NUMBER (line_map *map) File(s) at the bottom of the include stack have this set. */ inline int -ORDINARY_MAP_INCLUDER_FILE_INDEX (const line_map *map) +ORDINARY_MAP_INCLUDER_FILE_INDEX (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.included_from; + return ord_map->included_from; } /* As above, but by reference (e.g. as an lvalue). */ inline int& -ORDINARY_MAP_INCLUDER_FILE_INDEX (line_map *map) +ORDINARY_MAP_INCLUDER_FILE_INDEX (line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.included_from; + return ord_map->included_from; } /* Return a positive value if map encodes locations from a system @@ -389,129 +402,147 @@ ORDINARY_MAP_INCLUDER_FILE_INDEX (line_map *map) that therefore needs to be extern "C" protected in C++. */ inline unsigned char -ORDINARY_MAP_IN_SYSTEM_HEADER_P (const line_map *map) +ORDINARY_MAP_IN_SYSTEM_HEADER_P (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.sysp; + return ord_map->sysp; } /* As above, but by reference (e.g. as an lvalue). */ inline unsigned char & -ORDINARY_MAP_IN_SYSTEM_HEADER_P (line_map *map) +ORDINARY_MAP_IN_SYSTEM_HEADER_P (line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.sysp; + return ord_map->sysp; } /* Get the number of the low-order source_location bits used for a column number within ordinary map MAP. */ inline unsigned char -ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (const line_map *map) +ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.column_bits; + return ord_map->column_bits; } /* Set the number of the low-order source_location bits used for a column number within ordinary map MAP. */ inline void -SET_ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (line_map *map, int col_bits) +SET_ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (line_map_ordinary *ord_map, + int col_bits) { - linemap_check_ordinary (map)->d.ordinary.column_bits = col_bits; + ord_map->column_bits = col_bits; } /* Get the filename of ordinary map MAP. */ inline const char * -ORDINARY_MAP_FILE_NAME (const line_map *map) +ORDINARY_MAP_FILE_NAME (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_file; + return ord_map->to_file; } /* As above, but by reference (e.g. as an lvalue). */ inline const char * & -ORDINARY_MAP_FILE_NAME (line_map *map) +ORDINARY_MAP_FILE_NAME (line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_file; + return ord_map->to_file; } /* Get the cpp macro whose expansion gave birth to macro map MAP. */ inline cpp_hashnode * -MACRO_MAP_MACRO (const line_map *map) +MACRO_MAP_MACRO (const line_map_macro *macro_map) { - return map->d.macro.macro; + return macro_map->macro; } /* As above, but by reference (e.g. as an lvalue). */ inline cpp_hashnode * & -MACRO_MAP_MACRO (line_map *map) +MACRO_MAP_MACRO (line_map_macro *macro_map) { - return map->d.macro.macro; + return macro_map->macro; } /* Get the number of tokens inside the replacement-list of the macro that led to macro map MAP. */ inline unsigned int -MACRO_MAP_NUM_MACRO_TOKENS (const line_map *map) +MACRO_MAP_NUM_MACRO_TOKENS (const line_map_macro *macro_map) { - return map->d.macro.n_tokens; + return macro_map->n_tokens; } /* As above, but by reference (e.g. as an lvalue). */ inline unsigned int & -MACRO_MAP_NUM_MACRO_TOKENS (line_map *map) +MACRO_MAP_NUM_MACRO_TOKENS (line_map_macro *macro_map) { - return map->d.macro.n_tokens; + return macro_map->n_tokens; } /* Get the array of pairs of locations within macro map MAP. See the declaration of line_map_macro for more information. */ inline source_location * -MACRO_MAP_LOCATIONS (const line_map *map) +MACRO_MAP_LOCATIONS (const line_map_macro *macro_map) { - return map->d.macro.macro_locations; + return macro_map->macro_locations; } /* As above, but by reference (e.g. as an lvalue). */ inline source_location * & -MACRO_MAP_LOCATIONS (line_map *map) +MACRO_MAP_LOCATIONS (line_map_macro *macro_map) { - return map->d.macro.macro_locations; + return macro_map->macro_locations; } /* Get the location of the expansion point of the macro map MAP. */ inline source_location -MACRO_MAP_EXPANSION_POINT_LOCATION (const line_map *map) +MACRO_MAP_EXPANSION_POINT_LOCATION (const line_map_macro *macro_map) { - return map->d.macro.expansion; + return macro_map->expansion; } /* As above, but by reference (e.g. as an lvalue). */ inline source_location & -MACRO_MAP_EXPANSION_POINT_LOCATION (line_map *map) +MACRO_MAP_EXPANSION_POINT_LOCATION (line_map_macro *macro_map) { - return map->d.macro.expansion; + return macro_map->expansion; } /* The abstraction of a set of location maps. There can be several types of location maps. This abstraction contains the attributes - that are independent from the type of the map. */ -struct GTY(()) maps_info { - /* This array contains the different line maps. - A line map is created for the following events: - - when a new preprocessing unit start. - - when a preprocessing unit ends. - - when a macro expansion occurs. */ - struct line_map * GTY ((length ("%h.used"))) maps; + that are independent from the type of the map. + + Essentially this is just a vector of T_linemap_subclass, + which can only ever grow in size. */ + +struct GTY(()) maps_info_ordinary { + /* This array contains the "ordinary" line maps, for all + events other than macro expansion + (e.g. when a new preprocessing unit starts or ends). */ + line_map_ordinary * GTY ((length ("%h.used"))) maps; + + /* The total number of allocated maps. */ + unsigned int allocated; + + /* The number of elements used in maps. This number is smaller + or equal to ALLOCATED. */ + unsigned int used; + + unsigned int cache; +}; + +struct GTY(()) maps_info_macro { + /* This array contains the macro line maps. + A macro line map is created whenever a macro expansion occurs. */ + line_map_macro * GTY ((length ("%h.used"))) maps; /* The total number of allocated maps. */ unsigned int allocated; @@ -551,9 +582,9 @@ struct GTY(()) location_adhoc_data_map { /* A set of chronological line_map structures. */ struct GTY(()) line_maps { - struct maps_info info_ordinary; + maps_info_ordinary info_ordinary; - struct maps_info info_macro; + maps_info_macro info_macro; /* Depth of the include stack, including the current file. */ unsigned int depth; @@ -589,50 +620,15 @@ struct GTY(()) line_maps { bool seen_line_directive; }; -/* Returns the pointer to the memory region where information about - maps are stored in the line table SET. MACRO_MAP_P is a flag - telling if we want macro or ordinary maps. */ -inline struct maps_info * -LINEMAPS_MAP_INFO (line_maps *set, bool macro_map_p) -{ - return (macro_map_p - ? &(set->info_macro) - : &(set->info_ordinary)); -} - -/* As above, but preserving constness. */ - -inline const struct maps_info * -LINEMAPS_MAP_INFO (const line_maps *set, bool macro_map_p) -{ - return (macro_map_p - ? &(set->info_macro) - : &(set->info_ordinary)); -} - -/* Returns the pointer to the memory region where maps are stored in - the line table SET. MAP_KIND shall be TRUE if we are interested in - macro maps false otherwise. */ -inline line_map * -LINEMAPS_MAPS (const line_maps *set, bool map_kind) -{ - return LINEMAPS_MAP_INFO (set, map_kind)->maps; -} - -/* As above, but by reference (e.g. as an lvalue). */ - -inline line_map * & -LINEMAPS_MAPS (line_maps *set, bool map_kind) -{ - return LINEMAPS_MAP_INFO (set, map_kind)->maps; -} - /* Returns the number of allocated maps so far. MAP_KIND shall be TRUE if we are interested in macro maps, FALSE otherwise. */ inline unsigned int LINEMAPS_ALLOCATED (const line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->allocated; + if (map_kind) + return set->info_macro.allocated; + else + return set->info_ordinary.allocated; } /* As above, but by reference (e.g. as an lvalue). */ @@ -640,7 +636,10 @@ LINEMAPS_ALLOCATED (const line_maps *set, bool map_kind) inline unsigned int & LINEMAPS_ALLOCATED (line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->allocated; + if (map_kind) + return set->info_macro.allocated; + else + return set->info_ordinary.allocated; } /* Returns the number of used maps so far. MAP_KIND shall be TRUE if @@ -648,7 +647,10 @@ LINEMAPS_ALLOCATED (line_maps *set, bool map_kind) inline unsigned int LINEMAPS_USED (const line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->used; + if (map_kind) + return set->info_macro.used; + else + return set->info_ordinary.used; } /* As above, but by reference (e.g. as an lvalue). */ @@ -656,7 +658,10 @@ LINEMAPS_USED (const line_maps *set, bool map_kind) inline unsigned int & LINEMAPS_USED (line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->used; + if (map_kind) + return set->info_macro.used; + else + return set->info_ordinary.used; } /* Returns the index of the last map that was looked up with @@ -665,7 +670,10 @@ LINEMAPS_USED (line_maps *set, bool map_kind) inline unsigned int LINEMAPS_CACHE (const line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->cache; + if (map_kind) + return set->info_macro.cache; + else + return set->info_ordinary.cache; } /* As above, but by reference (e.g. as an lvalue). */ @@ -673,14 +681,20 @@ LINEMAPS_CACHE (const line_maps *set, bool map_kind) inline unsigned int & LINEMAPS_CACHE (line_maps *set, bool map_kind) { - return LINEMAPS_MAP_INFO (set, map_kind)->cache; + if (map_kind) + return set->info_macro.cache; + else + return set->info_ordinary.cache; } /* Return the map at a given index. */ inline line_map * LINEMAPS_MAP_AT (const line_maps *set, bool map_kind, int index) { - return &(LINEMAPS_MAPS (set, map_kind)[index]); + if (map_kind) + return &set->info_macro.maps[index]; + else + return &set->info_ordinary.maps[index]; } /* Returns the last map used in the line table SET. MAP_KIND @@ -705,17 +719,19 @@ LINEMAPS_LAST_ALLOCATED_MAP (const line_maps *set, bool map_kind) /* Returns a pointer to the memory region where ordinary maps are allocated in the line table SET. */ -inline line_map * +inline line_map_ordinary * LINEMAPS_ORDINARY_MAPS (const line_maps *set) { - return LINEMAPS_MAPS (set, false); + return set->info_ordinary.maps; } /* Returns the INDEXth ordinary map. */ -inline line_map * +inline line_map_ordinary * LINEMAPS_ORDINARY_MAP_AT (const line_maps *set, int index) { - return LINEMAPS_MAP_AT (set, false, index); + linemap_assert (index >= 0); + linemap_assert ((unsigned int)index < set->info_ordinary.used); + return &set->info_ordinary.maps[index]; } /* Return the number of ordinary maps allocated in the line table @@ -751,33 +767,35 @@ LINEMAPS_ORDINARY_CACHE (line_maps *set) /* Returns a pointer to the last ordinary map used in the line table SET. */ -inline line_map * +inline line_map_ordinary * LINEMAPS_LAST_ORDINARY_MAP (const line_maps *set) { - return LINEMAPS_LAST_MAP (set, false); + return (line_map_ordinary *)LINEMAPS_LAST_MAP (set, false); } /* Returns a pointer to the last ordinary map allocated the line table SET. */ -inline line_map * +inline line_map_ordinary * LINEMAPS_LAST_ALLOCATED_ORDINARY_MAP (const line_maps *set) { - return LINEMAPS_LAST_ALLOCATED_MAP (set, false); + return (line_map_ordinary *)LINEMAPS_LAST_ALLOCATED_MAP (set, false); } /* Returns a pointer to the beginning of the region where macro maps are allcoated. */ -inline line_map * +inline line_map_macro * LINEMAPS_MACRO_MAPS (const line_maps *set) { - return LINEMAPS_MAPS (set, true); + return set->info_macro.maps; } /* Returns the INDEXth macro map. */ -inline line_map * +inline line_map_macro * LINEMAPS_MACRO_MAP_AT (const line_maps *set, int index) { - return LINEMAPS_MAP_AT (set, true, index); + linemap_assert (index >= 0); + linemap_assert ((unsigned int)index < set->info_macro.used); + return &set->info_macro.maps[index]; } /* Returns the number of macro maps that were allocated in the line @@ -812,10 +830,10 @@ LINEMAPS_MACRO_CACHE (line_maps *set) } /* Returns the last macro map used in the line table SET. */ -inline line_map * +inline line_map_macro * LINEMAPS_LAST_MACRO_MAP (const line_maps *set) { - return LINEMAPS_LAST_MAP (set, true); + return (line_map_macro *)LINEMAPS_LAST_MAP (set, true); } /* Returns the lowest location [of a token resulting from macro @@ -829,10 +847,10 @@ LINEMAPS_MACRO_LOWEST_LOCATION (const line_maps *set) } /* Returns the last macro map allocated in the line table SET. */ -inline line_map * +inline line_map_macro * LINEMAPS_LAST_ALLOCATED_MACRO_MAP (const line_maps *set) { - return LINEMAPS_LAST_ALLOCATED_MAP (set, true); + return (line_map_macro *)LINEMAPS_LAST_ALLOCATED_MAP (set, true); } extern void location_adhoc_data_fini (struct line_maps *); @@ -913,7 +931,7 @@ extern const struct line_map *linemap_lookup bool linemap_tracks_macro_expansion_locs_p (struct line_maps *); /* Return the name of the macro associated to MACRO_MAP. */ -const char* linemap_map_get_macro_name (const struct line_map*); +const char* linemap_map_get_macro_name (const line_map_macro *); /* Return a positive value if LOCATION is the locus of a token that is located in a system header, O otherwise. It returns 1 if LOCATION @@ -940,37 +958,36 @@ const int RESERVED_LOCATION_COUNT = 2; /* Converts a map and a source_location to source line. */ inline linenum_type -SOURCE_LINE (const struct line_map *map, source_location loc) +SOURCE_LINE (const line_map_ordinary *ord_map, source_location loc) { - return ((loc - linemap_check_ordinary (map)->start_location) - >> map->d.ordinary.column_bits) + map->d.ordinary.to_line; + return ((loc - ord_map->start_location) + >> ord_map->column_bits) + ord_map->to_line; } /* Convert a map and source_location to source column number. */ inline linenum_type -SOURCE_COLUMN (const struct line_map *map, source_location loc) +SOURCE_COLUMN (const line_map_ordinary *ord_map, source_location loc) { - return ((loc - linemap_check_ordinary (map)->start_location) - & ((1 << map->d.ordinary.column_bits) - 1)); + return ((loc - ord_map->start_location) + & ((1 << ord_map->column_bits) - 1)); } /* Return the location of the last source line within an ordinary map. */ inline source_location -LAST_SOURCE_LINE_LOCATION (const struct line_map *map) +LAST_SOURCE_LINE_LOCATION (const line_map_ordinary *map) { - return (((linemap_check_ordinary (map)[1].start_location - 1 + return (((map[1].start_location - 1 - map->start_location) - & ~((1 << map->d.ordinary.column_bits) - 1)) + & ~((1 << map->column_bits) - 1)) + map->start_location); } /* Returns the last source line number within an ordinary map. This is the (last) line of the #include, or other directive, that caused a map change. */ - inline linenum_type -LAST_SOURCE_LINE (const struct line_map *map) +LAST_SOURCE_LINE (const line_map_ordinary *map) { return SOURCE_LINE (map, LAST_SOURCE_LINE_LOCATION (map)); } @@ -978,7 +995,7 @@ LAST_SOURCE_LINE (const struct line_map *map) /* Return the last column number within an ordinary map. */ inline linenum_type -LAST_SOURCE_COLUMN (const struct line_map *map) +LAST_SOURCE_COLUMN (const line_map_ordinary *map) { return SOURCE_COLUMN (map, LAST_SOURCE_LINE_LOCATION (map)); } @@ -986,21 +1003,20 @@ LAST_SOURCE_COLUMN (const struct line_map *map) /* Returns the map a given map was included from, or NULL if the map belongs to the main file, i.e, a file that wasn't included by another one. */ - -inline struct line_map * -INCLUDED_FROM (struct line_maps *set, const struct line_map *map) +inline line_map_ordinary * +INCLUDED_FROM (struct line_maps *set, const line_map_ordinary *ord_map) { - return ((linemap_check_ordinary (map)->d.ordinary.included_from == -1) + return ((ord_map->included_from == -1) ? NULL - : (&LINEMAPS_ORDINARY_MAPS (set)[(map)->d.ordinary.included_from])); + : LINEMAPS_ORDINARY_MAP_AT (set, ord_map->included_from)); } /* True if the map is at the bottom of the include stack. */ inline bool -MAIN_FILE_P (const struct line_map *map) +MAIN_FILE_P (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.included_from < 0; + return ord_map->included_from < 0; } /* Encode and return a source_location from a column number. The @@ -1013,7 +1029,7 @@ linemap_position_for_column (struct line_maps *, unsigned int); /* Encode and return a source location from a given line and column. */ source_location -linemap_position_for_line_and_column (const struct line_map *, +linemap_position_for_line_and_column (const line_map_ordinary *, linenum_type, unsigned int); /* Encode and return a source_location starting from location LOC and @@ -1026,16 +1042,16 @@ linemap_position_for_loc_and_offset (struct line_maps *set, /* Return the file this map is for. */ inline const char * -LINEMAP_FILE (const struct line_map *map) +LINEMAP_FILE (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_file; + return ord_map->to_file; } /* Return the line number this map started encoding location from. */ inline linenum_type -LINEMAP_LINE (const struct line_map *map) +LINEMAP_LINE (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.to_line; + return ord_map->to_line; } /* Return a positive value if map encodes locations from a system @@ -1043,9 +1059,9 @@ LINEMAP_LINE (const struct line_map *map) system header and 2 if it encodes locations in a C system header that therefore needs to be extern "C" protected in C++. */ inline unsigned char -LINEMAP_SYSP (const struct line_map *map) +LINEMAP_SYSP (const line_map_ordinary *ord_map) { - return linemap_check_ordinary (map)->d.ordinary.sysp; + return ord_map->sysp; } /* Return a positive value if PRE denotes the location of a token that @@ -1144,7 +1160,7 @@ enum location_resolution_kind source_location linemap_resolve_location (struct line_maps *, source_location loc, enum location_resolution_kind lrk, - const struct line_map **loc_map); + const line_map_ordinary **loc_map); /* Suppose that LOC is the virtual location of a token coming from the expansion of a macro M. This function then steps up to get the |