diff mbox

[01/11] Fix cpp_sys_macro_p with -ftrack-macro-expansion

Message ID m3r4vqw5nq.fsf@redhat.com
State New
Headers show

Commit Message

Dodji Seketeli April 14, 2012, 6:05 p.m. UTC 
Jason Merrill <jason@redhat.com> writes:

> On 04/10/2012 10:55 AM, Dodji Seketeli wrote:
>> +  if (CPP_OPTION (pfile, track_macro_expansion))
>
> I think this should check context->tokens_kind rather than the
> compiler flag.

OK.

Below is the updated patch that does that.

Tested and bootstrapped on x86_64-unknown-linux-gnu against trunk.

libcpp/

	* macro.c (cpp_sys_macro_p):  Support -ftrack-macro-expansion.
---
 libcpp/macro.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

Comments

Jason Merrill April 15, 2012, 3:52 a.m. UTC | #1 
OK.

Jason
diff mbox

Patch

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;
 }