diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2023-10-31 17:05:41 -0400 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2023-10-31 17:05:41 -0400 |
| commit | b0f19336f247c63abbc08935f0c1efe16f22ac3a (patch) | |
| tree | d4d286381a55e1118a6e487b54f8526b0801febf /libcpp/line-map.cc | |
| parent | 8b4ac021cd1f63125aaf8397479602b950438385 (diff) | |
| download | gcc-b0f19336f247c63abbc08935f0c1efe16f22ac3a.zip gcc-b0f19336f247c63abbc08935f0c1efe16f22ac3a.tar.gz gcc-b0f19336f247c63abbc08935f0c1efe16f22ac3a.tar.bz2 | |
libcpp: eliminate MACRO_MAP_EXPANSION_POINT_LOCATION
This patch eliminates the function "MACRO_MAP_EXPANSION_POINT_LOCATION"
(which hasn't been a macro since r6-739-g0501dbd932a7e9) in favor of
a new line_map_macro::get_expansion_point_location accessor.
No functional change intended.
gcc/c-family/ChangeLog:
* c-warn.cc (warn_for_multistatement_macros): Update for removal
of MACRO_MAP_EXPANSION_POINT_LOCATION.
gcc/cp/ChangeLog:
* module.cc (ordinary_loc_of): Update for removal of
MACRO_MAP_EXPANSION_POINT_LOCATION.
(module_state::note_location): Update for renaming of field.
(module_state::write_macro_maps): Likewise.
gcc/ChangeLog:
* input.cc (dump_location_info): Update for removal of
MACRO_MAP_EXPANSION_POINT_LOCATION.
* tree-diagnostic.cc (maybe_unwind_expanded_macro_loc):
Likewise.
libcpp/ChangeLog:
* include/line-map.h
(line_map_macro::get_expansion_point_location): New accessor.
(line_map_macro::expansion): Rename field to...
(line_map_macro::mexpansion): Rename field to...
(MACRO_MAP_EXPANSION_POINT_LOCATION): Delete this function.
* line-map.cc (linemap_enter_macro): Update for renaming of field.
(linemap_macro_map_loc_to_exp_point): Update for removal of
MACRO_MAP_EXPANSION_POINT_LOCATION.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'libcpp/line-map.cc')
| -rw-r--r-- | libcpp/line-map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpp/line-map.cc b/libcpp/line-map.cc index cd17353..cc9e14a 100644 --- a/libcpp/line-map.cc +++ b/libcpp/line-map.cc @@ -782,7 +782,7 @@ linemap_enter_macro (class line_maps *set, struct cpp_hashnode *macro_node, map->macro_locations = (location_t*) set->m_reallocator (nullptr, 2 * num_tokens * sizeof (location_t)); - map->expansion = expansion; + map->m_expansion = expansion; memset (MACRO_MAP_LOCATIONS (map), 0, 2 * num_tokens * sizeof (location_t)); @@ -1225,7 +1225,7 @@ linemap_macro_map_loc_to_exp_point (const line_map_macro *map, linemap_assert ((location - MAP_START_LOCATION (map)) < MACRO_MAP_NUM_MACRO_TOKENS (map)); - return MACRO_MAP_EXPANSION_POINT_LOCATION (map); + return map->get_expansion_point_location (); } /* LOCATION is the source location of a token that belongs to a macro |