r186966 - in /trunk: gcc/testsuite/ChangeLog gc...

[dodji at gcc dot gnu dot org]

Author: dodji
Date: Mon Apr 30 11:41:21 2012
New Revision: 186966

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=186966
Log:
Fix token pasting with -ftrack-macro-expansion

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.

Added:
    trunk/gcc/testsuite/gcc.dg/cpp/macro-exp-tracking-5.c
    trunk/gcc/testsuite/gcc.dg/cpp/paste17.c
Modified:
    trunk/gcc/testsuite/ChangeLog
    trunk/libcpp/ChangeLog
    trunk/libcpp/macro.c