diff options
| author | Bernd Schmidt <bernds@redhat.com> | 2016-04-13 11:40:37 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2016-04-13 11:40:37 +0000 |
| commit | 12de22454259eae414bcaa0c3edd38ed0e40cf77 (patch) | |
| tree | c1e054b9ca95c8f0e55a13d3e32e87ea4179b608 /libcpp/directives.c | |
| parent | abdb7e1568cc7d68d8f1ee0bbe7488bdca540548 (diff) | |
| download | gcc-12de22454259eae414bcaa0c3edd38ed0e40cf77.zip gcc-12de22454259eae414bcaa0c3edd38ed0e40cf77.tar.gz gcc-12de22454259eae414bcaa0c3edd38ed0e40cf77.tar.bz2 | |
re PR preprocessor/69650 (ICE in linemap_line_start, at libcpp/line-map.c:803)
Patch from Roger Orr <rogero@howzatt.demon.co.uk>
PR preprocessor/69650
* directives.c (do_linemarker): Reread map after calling
cpp_get_token.
From-SVN: r234932
Diffstat (limited to 'libcpp/directives.c')
| -rw-r--r-- | libcpp/directives.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/directives.c b/libcpp/directives.c index 6aa6bd1..1617ff6 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -1048,6 +1048,9 @@ do_linemarker (cpp_reader *pfile) if (reason == LC_LEAVE) { + /* Reread map since cpp_get_token can invalidate it with a + reallocation. */ + map = LINEMAPS_LAST_ORDINARY_MAP (line_table); const line_map_ordinary *from; if (MAIN_FILE_P (map) || (new_file @@ -1055,7 +1058,8 @@ do_linemarker (cpp_reader *pfile) && filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0)) { cpp_warning (pfile, CPP_W_NONE, - "file \"%s\" linemarker ignored due to incorrect nesting", new_file); + "file \"%s\" linemarker ignored due to " + "incorrect nesting", new_file); return; } } |