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

Fix min_location usage in line-map.c (PR preprocessor/90382).

Browse source 
2019-05-14  Martin Liska  <mliska@suse.cz>

	PR preprocessor/90382
	* line-map.c (first_map_in_common_1): Handle ADHOC
	locations.

From-SVN: r271163
This commit is contained in:
Martin Liska 2019-05-14 13:41:53 +02:00 • committed by Martin Liska
parent e6fc8353fc
commit 19eda56db6
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libcpp/ChangeLog
View file

@ -1,3 +1,9 @@
2019-05-14 Martin Liska <mliska@suse.cz>
PR preprocessor/90382
* line-map.c (first_map_in_common_1): Handle ADHOC
locations.
2019-05-14 Martin Liska <mliska@suse.cz>
PR preprocessor/90382

9
libcpp/line-map.c
View file

@ -1251,8 +1251,13 @@ first_map_in_common_1 (struct line_maps *set,
location_t *loc1)
{
location_t l0 = *loc0, l1 = *loc1;
const struct line_map *map0 = linemap_lookup (set, l0),
*map1 = linemap_lookup (set, l1);
const struct line_map *map0 = linemap_lookup (set, l0);
if (IS_ADHOC_LOC (l0))
l0 = get_location_from_adhoc_loc (set, l0);
const struct line_map *map1 = linemap_lookup (set, l1);
if (IS_ADHOC_LOC (l1))
l1 = get_location_from_adhoc_loc (set, l1);
while (linemap_macro_expansion_map_p (map0)
&& linemap_macro_expansion_map_p (map1)