The fact that extra line directives are inserted around built-in
tokens isn't ideal, but I must concur with Dodji's assessment that
such a fix belongs in a separate patch.
The purpose of this patch is to resolve a discrepancy between
integrated-cpp and non-integrated-cpp. The locations of built-in
tokens is odd, but consistent. It is an orthogonal issue, and
therefore should not be fixed as part of this diff.
In terms of practical considerations, the impact of the extra line
directives is minimal. The main concern of the two reporters (see
gcc.gnu.org/bugzilla/show_bug.cgi?id=60723) is resolved by this
patch, and is completely unaffected by the extra directives.
I think that this patch is good to go.
Regards,
Nicholas
P.S. Dodji, if you are also going to fix the locations of built-in
tokens, it would also be worth adjusting their expansion
locations. As mentioned in the bug report, built-in tokens are
expanded at the closing paren of a macro call, whereas non-built-in
tokens are expanded at the opening paren. This is weird.
