diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 9 | ||||
| -rw-r--r-- | libcpp/include/line-map.h | 6 | ||||
| -rw-r--r-- | libcpp/line-map.c | 27 |
3 files changed, 42 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 56971ad..37825f5 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,5 +1,14 @@ 2016-08-26 David Malcolm <dmalcolm@redhat.com> + * include/line-map.h (get_pure_location): New decl. + * line-map.c (get_pure_location): Move here, from gcc/input.c, adding + a line_maps * param. + (rich_location::add_fixit_insert): Call get_pure_location on "where". + (rich_location::add_fixit_replace): Call get_pure_location on the + end-points. + +2016-08-26 David Malcolm <dmalcolm@redhat.com> + * include/line-map.h (rich_location): Eliminate unimplemented constructor based on source_range. (rich_location::get_last_fixit_hint): New method. diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 0fc4848..d9c31de 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -1002,6 +1002,12 @@ IS_ADHOC_LOC (source_location loc) bool pure_location_p (line_maps *set, source_location loc); +/* Given location LOC within SET, strip away any packed range information + or ad-hoc information. */ + +extern source_location get_pure_location (line_maps *set, + source_location loc); + /* Combine LOC and BLOCK, giving a combined adhoc location. */ inline source_location diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 8fe48bd..f5b1586 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -311,6 +311,28 @@ pure_location_p (line_maps *set, source_location loc) return true; } +/* Given location LOC within SET, strip away any packed range information + or ad-hoc information. */ + +source_location +get_pure_location (line_maps *set, source_location loc) +{ + if (IS_ADHOC_LOC (loc)) + loc + = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus; + + if (loc >= LINEMAPS_MACRO_LOWEST_LOCATION (set)) + return loc; + + if (loc < RESERVED_LOCATION_COUNT) + return loc; + + const line_map *map = linemap_lookup (set, loc); + const line_map_ordinary *ordmap = linemap_check_ordinary (map); + + return loc & ~((1 << ordmap->m_range_bits) - 1); +} + /* Finalize the location_adhoc_data structure. */ void location_adhoc_data_fini (struct line_maps *set) @@ -2077,6 +2099,8 @@ void rich_location::add_fixit_insert (source_location where, const char *new_content) { + where = get_pure_location (m_line_table, where); + if (reject_impossible_fixit (where)) return; @@ -2141,6 +2165,9 @@ rich_location::add_fixit_replace (source_range src_range, { linemap_assert (m_num_fixit_hints < MAX_FIXIT_HINTS); + src_range.m_start = get_pure_location (m_line_table, src_range.m_start); + src_range.m_finish = get_pure_location (m_line_table, src_range.m_finish); + if (reject_impossible_fixit (src_range.m_start)) return; if (reject_impossible_fixit (src_range.m_finish)) |