From: Dodji Seketeli <dodji@redhat.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Tom Tromey <tromey@redhat.com>, Jason Merrill <jason@redhat.com>,
Gabriel Dos Reis <gdr@integrable-solutions.net>
Subject: [PATCH 01/11] Fix cpp_sys_macro_p with -ftrack-macro-expansion
Date: Tue, 10 Apr 2012 14:55:00 -0000 [thread overview]
Message-ID: <m38vi38wmm.fsf@redhat.com> (raw)
In-Reply-To: <m3hawr8wpz.fsf@redhat.com> (Dodji Seketeli's message of "Tue, 10 Apr 2012 16:53:12 +0200")
Hello,
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.
---
libcpp/macro.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/libcpp/macro.c b/libcpp/macro.c
index 54de3e3..58a722c 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -2436,7 +2436,15 @@ 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 (CPP_OPTION (pfile, track_macro_expansion))
+ {
+ if (pfile->context->c.mc)
+ node = pfile->context->c.mc->macro_node;
+ }
+ else
+ node = pfile->context->c.macro;
return node && node->value.macro && node->value.macro->syshdr;
}
--
Dodji
next prev parent reply other threads:[~2012-04-10 14:55 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 14:53 Patches to enable -ftrack-macro-expansion by default Dodji Seketeli
2012-04-10 14:55 ` Dodji Seketeli [this message]
2012-04-11 13:40 ` [PATCH 01/11] Fix cpp_sys_macro_p with -ftrack-macro-expansion Jason Merrill
2012-04-14 18:05 ` Dodji Seketeli
2012-04-15 3:52 ` Jason Merrill
2012-04-10 14:57 ` [PATCH 02/11] Fix token pasting " Dodji Seketeli
2012-04-11 13:41 ` Jason Merrill
2012-04-14 18:07 ` Dodji Seketeli
2012-04-10 15:08 ` [PATCH 03/11] Fix PCH crash on GTYed pointer-to-scalar field of a Dodji Seketeli
2012-04-11 3:15 ` Laurynas Biveinis
2012-04-10 19:43 ` [PATCH 04/11] Fix expansion point loc for macro-like tokens Dodji Seketeli
2012-04-11 13:46 ` Jason Merrill
2012-04-25 9:07 ` Dodji Seketeli
2012-04-29 4:08 ` Jason Merrill
2012-04-29 16:55 ` Dodji Seketeli
2012-04-30 3:20 ` Jason Merrill
2012-04-10 19:50 ` [PATCH 05/11] Make expand_location resolve to locus in main source file Dodji Seketeli
2012-04-11 13:49 ` Jason Merrill
2012-04-25 9:50 ` Dodji Seketeli
2012-04-25 15:31 ` Dodji Seketeli
2012-04-29 4:11 ` Jason Merrill
2012-04-29 16:57 ` Dodji Seketeli
2012-04-10 19:56 ` [PATCH 06/11] Strip "<built-in>" loc from displayed expansion context Dodji Seketeli
2012-04-11 13:50 ` Jason Merrill
2012-04-10 20:31 ` [PATCH 07/11] Fix -Wuninitialized for -ftrack-macro-expansion Dodji Seketeli
2012-04-11 13:52 ` Jason Merrill
2012-04-11 9:00 ` [PATCH 09/11] Fix va_arg type location Dodji Seketeli
2012-04-11 13:36 ` Gabriel Dos Reis
2012-04-11 9:26 ` [PATCH 08/11] Make conversion warnings work on NULL with -ftrack-macro-expansion Dodji Seketeli
2012-04-11 13:33 ` Gabriel Dos Reis
2012-04-25 13:42 ` Dodji Seketeli
2012-04-25 14:07 ` Gabriel Dos Reis
2012-04-25 14:50 ` Dodji Seketeli
2012-04-25 15:22 ` Gabriel Dos Reis
2012-04-25 13:55 ` [PATCH 10/13] Fix location for static class members Dodji Seketeli
2012-04-25 14:13 ` Gabriel Dos Reis
2012-04-25 14:04 ` [PATCH 11/13] Fix va_start related location Dodji Seketeli
2012-04-25 14:11 ` Gabriel Dos Reis
2012-04-25 15:20 ` Dodji Seketeli
2012-04-25 15:23 ` Gabriel Dos Reis
2012-04-27 15:06 ` Dodji Seketeli
2012-04-27 21:46 ` Dodji Seketeli
2012-04-28 23:30 ` Gabriel Dos Reis
2012-04-25 14:17 ` [PATCH 12/13] Adjust relevant test cases wrt -ftrack-macro-expansion=[0|2] Dodji Seketeli
2012-04-25 15:25 ` Gabriel Dos Reis
2012-04-29 17:38 ` Dodji Seketeli
2012-04-30 6:23 ` Dodji Seketeli
2012-04-30 7:34 ` Gabriel Dos Reis
2012-04-30 16:09 ` Mike Stump
2012-05-02 17:22 ` Greta Yorsh
2012-04-25 23:23 ` Benjamin Kosnik
2012-04-25 14:33 ` [PATCH 13/13] Switch -ftrack-macro-expansion=2 on by default Dodji Seketeli
2012-04-25 15:27 ` Gabriel Dos Reis
2012-04-25 17:50 ` Tom Tromey
2012-04-30 11:47 ` Patches to enable -ftrack-macro-expansion " Dodji Seketeli
2012-05-08 10:31 ` Andreas Krebbel
2012-08-26 0:28 ` Gerald Pfeifer
2012-08-26 0:41 ` Gabriel Dos Reis
2012-08-26 8:32 ` Dodji Seketeli
2012-08-26 20:01 ` Gerald Pfeifer
2012-08-26 20:14 ` Gabriel Dos Reis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m38vi38wmm.fsf@redhat.com \
--to=dodji@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gdr@integrable-solutions.net \
--cc=jason@redhat.com \
--cc=tromey@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).