From a1661b90dcbaed222e647bda75540e8a87f250ed Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Mon, 8 Jun 2015 15:16:12 +0000 Subject: re PR c/66415 (ice in location_column_from_byte_offset) PR c/66415 * c-format.c (location_from_offset): Return LOC if LINE is null. * line-map.c (linemap_position_for_loc_and_offset): Remove linemap_assert_fails; reverse conditions. * gcc.dg/cpp/pr66415-1.c: New test. * gcc.dg/cpp/pr66415-2.c: New test. From-SVN: r224236 --- libcpp/ChangeLog | 6 ++++++ libcpp/line-map.c | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'libcpp') diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 31d3b61..f373dad 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2015-06-08 Marek Polacek + + PR c/66415 + * line-map.c (linemap_position_for_loc_and_offset): Remove + linemap_assert_fails; reverse conditions. + 2015-05-26 Manuel López-Ibáñez * line-map.c (LINE_MAP_MAX_COLUMN_NUMBER diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 972f66c..d58cad2 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -688,15 +688,17 @@ linemap_position_for_loc_and_offset (struct line_maps *set, /* We find the real location and shift it. */ loc = linemap_resolve_location (set, loc, LRK_SPELLING_LOCATION, &map); /* The new location (loc + offset) should be higher than the first - location encoded by MAP. */ - if (linemap_assert_fails (MAP_START_LOCATION (map) < loc + offset)) + location encoded by MAP. + FIXME: We used to linemap_assert_fails here and in the if below, + but that led to PR66415. So give up for now. */ + if ((MAP_START_LOCATION (map) >= loc + offset)) return loc; /* If MAP is not the last line map of its set, then the new location (loc + offset) should be less than the first location encoded by the next line map of the set. */ if (map != LINEMAPS_LAST_ORDINARY_MAP (set)) - if (linemap_assert_fails (loc + offset < MAP_START_LOCATION (&map[1]))) + if ((loc + offset >= MAP_START_LOCATION (&map[1]))) return loc; offset += SOURCE_COLUMN (map, loc); -- cgit v1.1