yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix token pasting with -ftrack-macro-expansion

Browse Source 
This patch makes token pasting work with -ftrack-macro-expansion
turned on.  It improves some pasting related tests of the gcc.dg/cpp
subdirectory.

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

Note that the bootstrap with -ftrack-macro-expansion 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 (paste_all_tokens): Put the token resulting from pasting
	into an extended token context with -ftrack-macro-location is in
	effect.

gcc/testsuite/

	* gcc.dg/cpp/paste17.c: New test case for
	-ftrack-macro-expansion=2 mode only.
	* gcc.dg/cpp/macro-exp-tracking-5.c: Likewise.

From-SVN: r186966
This commit is contained in:
Dodji Seketeli
2012-04-30 11:41:21 +00:00
committed by Dodji Seketeli
parent 4e65a47055
commit 0ff2b8a022
5 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcpp/ChangeLog
+5
View File
@@ -1,5 +1,10 @@
2012-04-30 Dodji Seketeli <dodji@redhat.com>
Fix token pasting with -ftrack-macro-expansion
* macro.c (paste_all_tokens): Put the token resulting from pasting
into an extended token context with -ftrack-macro-location is in
effect.
Fix cpp_sys_macro_p with -ftrack-macro-expansion
* macro.c (cpp_sys_macro_p): Support -ftrack-macro-expansion.
libcpp/macro.c
+27 -1
View File
@@ -611,6 +611,21 @@ paste_all_tokens (cpp_reader *pfile, const cpp_token *lhs)
{
const cpp_token *rhs = NULL;
cpp_context *context = pfile->context;
source_location virt_loc = 0;
/* We must have been called on a token that appears at the left
hand side of a ## operator. */
if (!(lhs->flags & PASTE_LEFT))
abort ();
if (context->tokens_kind == TOKENS_KIND_EXTENDED)
/* The caller must have called consume_next_token_from_context
right before calling us. That has incremented the pointer to
the current virtual location. So it now points to the location
of the token that comes right after *LHS. We want the
resulting pasted token to have the location of the current
*LHS, though. */
virt_loc = context->c.mc->cur_virt_loc[-1];
do
{
@@ -650,7 +665,18 @@ paste_all_tokens (cpp_reader *pfile, const cpp_token *lhs)
while (rhs->flags & PASTE_LEFT);
/* Put the resulting token in its own context. */
_cpp_push_token_context (pfile, NULL, lhs, 1);
if (context->tokens_kind == TOKENS_KIND_EXTENDED)
{
source_location *virt_locs = NULL;
_cpp_buff *token_buf = tokens_buff_new (pfile, 1, &virt_locs);
tokens_buff_add_token (token_buf, virt_locs, lhs,
virt_loc, 0, NULL, 0);
push_extended_tokens_context (pfile, context->c.mc->macro_node,
token_buf, virt_locs,
(const cpp_token **)token_buf->base, 1);
}
else
_cpp_push_token_context (pfile, NULL, lhs, 1);
}
/* Returns TRUE if the number of arguments ARGC supplied in an