r208370 - in /branches/gcc-4_8-branch: gcc/test...

[jakub@gcc.gnu.org]

Author: jakub
Date: Thu Mar  6 08:10:08 2014
New Revision: 208370

URL: http://gcc.gnu.org/viewcvs?rev=208370&root=gcc&view=rev
Log:
	Backport from mainline
	2014-02-19  Jakub Jelinek  <jakub@redhat.com>

	PR preprocessor/58844
	* macro.c (enter_macro_context): Only push
	macro_real_token_count (macro) tokens rather than
	macro->count tokens, regardless of
	CPP_OPTION (pfile, track-macro-expansion).

	* c-c++-common/cpp/pr58844-1.c: New test.
	* c-c++-common/cpp/pr58844-2.c: New test.

Added:
    branches/gcc-4_8-branch/gcc/testsuite/c-c++-common/cpp/pr58844-1.c
    branches/gcc-4_8-branch/gcc/testsuite/c-c++-common/cpp/pr58844-2.c
Modified:
    branches/gcc-4_8-branch/gcc/testsuite/ChangeLog
    branches/gcc-4_8-branch/libcpp/ChangeLog
    branches/gcc-4_8-branch/libcpp/macro.c