procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libcpp: eliminate LINEMAPS_{ORDINARY,MACRO}_MAPS

Browse source 
libcpp/ChangeLog:
	* include/line-map.h (LINEMAPS_ORDINARY_MAPS): Delete.
	(LINEMAPS_MACRO_MAPS): Delete.
	* line-map.cc (linemap_tracks_macro_expansion_locs_p): Update for
	deletion of LINEMAPS_MACRO_MAPS.
	(linemap_get_statistics): Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>
This commit is contained in:
David Malcolm 2023-10-08 18:43:17 -04:00
parent 45bae1809c
commit 0a0ceb7a72
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libcpp/include/line-map.h
View file

@ -928,14 +928,6 @@ LINEMAPS_LAST_MAP (const line_maps *set, bool map_kind)
LINEMAPS_USED (set, map_kind) - 1);
}
/* Returns a pointer to the memory region where ordinary maps are
allocated in the line table SET. */
inline line_map_ordinary *
LINEMAPS_ORDINARY_MAPS (const line_maps *set)
{
return set->info_ordinary.maps;
}
/* Returns the INDEXth ordinary map. */
inline line_map_ordinary *
LINEMAPS_ORDINARY_MAP_AT (const line_maps *set, int index)
@ -968,14 +960,6 @@ LINEMAPS_LAST_ORDINARY_MAP (const line_maps *set)
return (line_map_ordinary *)LINEMAPS_LAST_MAP (set, false);
}
/* Returns a pointer to the beginning of the region where macro maps
are allocated. */
inline line_map_macro *
LINEMAPS_MACRO_MAPS (const line_maps *set)
{
return set->info_macro.maps;
}
/* Returns the INDEXth macro map. */
inline line_map_macro *
LINEMAPS_MACRO_MAP_AT (const line_maps *set, int index)

4
libcpp/line-map.cc
View file

@ -738,7 +738,7 @@ linemap_module_restore (line_maps *set, unsigned lwm)
bool
linemap_tracks_macro_expansion_locs_p (const line_maps *set)
{
return LINEMAPS_MACRO_MAPS (set) != NULL;
return set->info_macro.maps != nullptr;
}
/* Create a macro map. A macro map encodes source locations of tokens
@ -2076,7 +2076,7 @@ linemap_get_statistics (const line_maps *set,
macro_maps_allocated_size =
LINEMAPS_MACRO_ALLOCATED (set) * sizeof (struct line_map_macro);
for (cur_map = LINEMAPS_MACRO_MAPS (set);
for (cur_map = set->info_macro.maps;
cur_map && cur_map <= LINEMAPS_LAST_MACRO_MAP (set);
++cur_map)
{