Re: Followup fix for PR69650

2016-04-12 Thread Jakub Jelinek
On Tue, Apr 12, 2016 at 01:50:19PM +0200, Bernd Schmidt wrote: > PR preprocessor/69650 > * directives.c (do_linemarker): Reread map after calling > cpp_get_token. Ok, thanks. > --- libcpp/directives.c (revision 234831) > +++ libcpp/directives.c (working copy) > @@ -1

Followup fix for PR69650

2016-04-12 Thread Bernd Schmidt
As shown by Roger Orr in the comments of this PR, cpp_get_token can cause a reallocation that invalidates some of the variables in do_linemarker. It seems to occur in this call to linemap_add: /* Allocate the new line_map. However, if the current map only has a single line we ca