From 4e65a47055ed1e7fb0068125bd95708ed86ab9af Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Mon, 30 Apr 2012 11:41:08 +0000 Subject: Fix cpp_sys_macro_p with -ftrack-macro-expansion cpp_sys_macro_p crashes when -ftrack-macro-expansion is on. The issue can be reproduced by running the tests: runtest --tool gcc --tool_opts="-ftrack-macro-expansion" cpp.exp=sysmac1.c runtest --tool gcc --tool_opts="-ftrack-macro-expansion" cpp.exp=sysmac2.c This is because it just doesn't support that mode. Fixed thus. Tested and bootstrapped on x86_64-unknown-linux-gnu against trunk. Note that the bootstrap with -ftrack-macro-expansion turned on exhibits other separate issues that are addressed in subsequent patches. This patch just fixes one class of problems. The patch does pass bootstrap with -ftrack-macro-expansion turned off, though. libcpp/ * macro.c (cpp_sys_macro_p): Support -ftrack-macro-expansion. From-SVN: r186965 --- libcpp/ChangeLog | 5 +++++ libcpp/macro.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'libcpp') diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 4b66c841..c4f7c5a 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,8 @@ +2012-04-30 Dodji Seketeli + + Fix cpp_sys_macro_p with -ftrack-macro-expansion + * macro.c (cpp_sys_macro_p): Support -ftrack-macro-expansion. + 2012-04-29 Dodji Seketeli * lex.c (lex_raw_string): Change C++ style comments into C style diff --git a/libcpp/macro.c b/libcpp/macro.c index 54de3e3..4f8e52f 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -2436,7 +2436,12 @@ cpp_get_token_with_location (cpp_reader *pfile, source_location *loc) int cpp_sys_macro_p (cpp_reader *pfile) { - cpp_hashnode *node = pfile->context->c.macro; + cpp_hashnode *node = NULL; + + if (pfile->context->tokens_kind == TOKENS_KIND_EXTENDED) + node = pfile->context->c.mc->macro_node; + else + node = pfile->context->c.macro; return node && node->value.macro && node->value.macro->syshdr; } -- cgit v1.1