Properly initialize cpp_context in destringize_and_run
destringize_and_run forgets to initialize all the fields of the cpp_context that it pushes. Later _cpp_pop_context then gets confused when it accesses context->tokens_kind via the call to macro_of_context on context->prev. The first hunk of this patch is the real obvious fix. The second hunk is just an assert that I am adding to err on the safe side. Tested by on x86_64-unknown-linux-gnu against trunk by running the test gcc.dg/gomp/macro-4.c under Valgrind, and bootstrapped. libcpp/ * directives.c (destringize_and_run): Properly initialize the new context. * macro.c (_cpp_pop_context): Assert that we shouldn't try to pop the initial base context, which has the same life time as the current instance of cpp_file. From-SVN: r187054
This commit is contained in:
parent
355a767352
commit
3ad64f53da
3 changed files with 14 additions and 4 deletions
|
@ -1741,10 +1741,7 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in)
|
|||
saved_cur_token = pfile->cur_token;
|
||||
saved_cur_run = pfile->cur_run;
|
||||
|
||||
pfile->context = XNEW (cpp_context);
|
||||
pfile->context->c.macro = 0;
|
||||
pfile->context->prev = 0;
|
||||
pfile->context->next = 0;
|
||||
pfile->context = XCNEW (cpp_context);
|
||||
|
||||
/* Inline run_directive, since we need to delay the _cpp_pop_buffer
|
||||
until we've read all of the tokens that we want. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue