From 09321e8528219e75c0452bce4661b7c543ec235f Mon Sep 17 00:00:00 2001 From: bernds Date: Wed, 13 Apr 2016 11:40:37 +0000 Subject: [PATCH] Patch from Roger Orr PR preprocessor/69650 * directives.c (do_linemarker): Reread map after calling cpp_get_token. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234932 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcpp/ChangeLog | 7 +++++++ libcpp/directives.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 583f9542eabd..acb8d75dccfe 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2016-04-13 Bernd Schmidt + + Patch from Roger Orr + PR preprocessor/69650 + * directives.c (do_linemarker): Reread map after calling + cpp_get_token. + 2016-04-06 Richard Henderson PR preprocessor/61817 diff --git a/libcpp/directives.c b/libcpp/directives.c index 6aa6bd1f86ac..1617ff61c3c3 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; } } -- 2.39.2