* cpphash.c (_cpp_cleanup_hashtable, _cpp_lookup_with_hash)

        : Don't set fe_value.
        * cpplib.h (AVOID_LPASTE): New flag.
        (struct cpp_hashnode): Remove fe_value.
        * cpplex.c (cpp_avoid_paste): Don't paste '.' with a number.
        * cppmacro.c (builtin_macro): Don't set flags here.
        (replace_args): Set AVOID_LPASTE flag on first token of an
        argument, and the token following it.
        (cpp_get_token): Set AVOID_LPASTE flag on first token of a
        macro expansion, and on the token following it.  Do it for
        builtins too.
        * cppmain.c (scan_buffer): Avoid pasting only flagged tokens.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39318 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 2 deletions

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index c109a0f8ca6..9d0b8e253fb 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -166,6 +166,7 @@ struct cpp_string
 #define PASTE_LEFT	(1 << 3) /* If on LHS of a ## operator.  */
 #define NAMED_OP	(1 << 4) /* C++ named operators.  */
 #define NO_EXPAND	(1 << 5) /* Do not macro-expand this token.  */
+#define AVOID_LPASTE	(1 << 6) /* Check left for accidental pastes.  */
 
 /* A preprocessing token.  This has been carefully packed and should
    occupy 12 bytes on 32-bit hosts and 16 bytes on 64-bit hosts.  */
@@ -487,8 +488,6 @@ struct cpp_hashnode
     enum cpp_ttype operator;		/* Code for a named operator.  */
     enum builtin_type builtin;		/* Code for a builtin macro.  */
   } value;
-
-  union tree_node *fe_value;		/* Front end value.  */
 };
 
 /* Call this first to get a handle to pass to other functions.  */