[Bug preprocessor/61817] Inconsistent location of tokens in the expansion list of a built-in macro

[rth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61817

--- Comment #4 from Richard Henderson <rth at gcc dot gnu.org> ---
Author: rth
Date: Wed Apr  6 18:35:16 2016
New Revision: 234794

URL: https://gcc.gnu.org/viewcvs?rev=234794&root=gcc&view=rev
Log:
PR preprocessor/61817
PR preprocessor/69391

  * internal.h (_cpp_builtin_macro_text): Update decl.
  * macro.c (_cpp_builtin_macro_text): Accept location for __LINE__.
  (builtin_macro): Accept a second location for __LINE__.
  (enter_macro_context): Compute both virtual and real expansion
  locations for the macro.

  * gcc.dg/pr61817-1.c: New test.
  * gcc.dg/pr61817-2.c: New test.
  * gcc.dg/pr69391-1.c: New test.
  * gcc.dg/pr69391-2.c: New test.

Added:
    trunk/gcc/testsuite/gcc.dg/pr61817-1.c
    trunk/gcc/testsuite/gcc.dg/pr61817-2.c
    trunk/gcc/testsuite/gcc.dg/pr69391-1.c
    trunk/gcc/testsuite/gcc.dg/pr69391-2.c
Modified:
    trunk/gcc/testsuite/ChangeLog
    trunk/libcpp/ChangeLog
    trunk/libcpp/internal.h
    trunk/libcpp/macro.c