diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-08-08 18:13:00 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-08-08 18:13:00 +0000 |
| commit | f10a91352f83232394646df5a67bdb8f4366a067 (patch) | |
| tree | a4ec7ecbde7bfc84329e5a2bb1dc8dea689d7d31 /gcc/diagnostic.c | |
| parent | a801991954f70fb9470502d305065719849c5660 (diff) | |
| download | gcc-f10a91352f83232394646df5a67bdb8f4366a067.zip gcc-f10a91352f83232394646df5a67bdb8f4366a067.tar.gz gcc-f10a91352f83232394646df5a67bdb8f4366a067.tar.bz2 | |
[PATCH] line-map include-from representation
https://gcc.gnu.org/ml/gcc-patches/2018-08/msg00554.html
Make linemap::included_from a location
libcpp/
* include/line-map.h (struct line_map_ordinary): Replace
included_from map index with included_at source_location.
(ORDINARY_MAP_INCLUDER_FILE_INDEX): Delete.
(LAST_SOURCE_LINE_LOCATION): Delete.
(LAST_SOURCE_LINE, LAST_SOURCE_COLUMN): Delete.
(linemap_included_from): New.
(linemap_included_from_linemap): Declare.
(MAIN_FILE_P): Adjust.
* line-map.c (linemap_included_from_linemap): New.
(lonemap_check_files_exited): Use linemap_included_at.
(linemap_add): Adjust inclusion setting.
(linemap_dump, linemap_dump_location): Adjust.
* directives.c (do_linemarker): Use linemap_included_at.
gcc/
* diagnostic.c (diagnostic_report_current_module): Use
linemap_included_from & linemap_included_from_linemap.
gcc/c-family/
* c-common.c (try_to_locate_new_include_inertion_point): Use
linemap_included_from_linemap.
* c-lex.c (fe_file_change): Use linemap_included_from.
* c-ppoutput.c (pp_file_change): Likewise.
gcc/fortran/
* cpp.c (cb_file_change): Use linemap_included_from.
gcc/testsuite/
* c-c++-common/inc-from-1a.h, c-c++-common/inc-from-1b.h,
c-c++-common/inc-from-1.c: New
From-SVN: r263429
Diffstat (limited to 'gcc/diagnostic.c')
| -rw-r--r-- | gcc/diagnostic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 5205944..3d7f164 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -590,9 +590,10 @@ diagnostic_report_current_module (diagnostic_context *context, location_t where) bool first = true; do { - map = INCLUDED_FROM (line_table, map); + where = linemap_included_from (map); + map = linemap_included_from_linemap (line_table, map); const char *line_col - = maybe_line_and_column (LAST_SOURCE_LINE (map), + = maybe_line_and_column (SOURCE_LINE (map, where), first && context->show_column ? SOURCE_COLUMN (map, where) : 0); static const char *const msgs[] = |