From: Nathan Sidwell <nathan@acm.org>
Date: Wed, 8 Aug 2018 19:32:23 +0000 (+0000)
Subject: cpplib.h (enum node_type): Rename to NT_USER_MACR, NT_BUILTIN_MACRO.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977fed5ba4d747d67cb98845008c15a5e0f7a61d;p=thirdparty%2Fgcc.git

cpplib.h (enum node_type): Rename to NT_USER_MACR, NT_BUILTIN_MACRO.

	libcpp/
	* include/cpplib.h (enum node_type): Rename to NT_USER_MACR,
	NT_BUILTIN_MACRO.
	(CPP_HASNODE_VALUE_IDX): Delete.
	(union _cpp_hashnode_value): Adjust.
	(struct cpp_hashnode): Likewise.
	(cpp_macro_p, cpp_user_macro_p, cpp_builtin_macro_p): New.
	* internal.h (_cpp_mark_macro_used): Use cpp_user_macro_p.
	* directives.c (do_undef, do_pragma_poison, do_ifdef, do_ifndef)
	(cpp_pop_definition): Use cpp_macro_p and friends.
	(doassert): Adjust.
	* expr.c (parse_defined): Use cpp_macro_p.
	* files.c (should_stack_file): Likewise.
	* identifiers.c (cpp_defined): Likewise.
	* init.c (cpp_init_special_builtins): Adjust.
	* lex.c (is_macro): Use cpp_macro_p.
	* macro.c (cpp_warn_if_unused_macro, enter_macro_context)
	(warn_of_redefinition, _cpp_create_definition): Use cpp_macro_p
	and friends.
	(_cpp_notify_macro_use): Adjust.
	(cpp_macro_p): Delete old definition.
	(cp_fun_like_macro_p): Use cpp_user_macro_p.
	(cpp_macro_definition): Likewise.
	* pch.c (write_macdef, count_defs, write_defs, save_macros): Adjust.
	* traditional.c (fun_loke_macro, maybe_start_funlike)
	(_cpp_scan_out_logical_line, push_replacement_text): Use
	cpp_macro_p and friends.
	gcc/c-family/
	* c-ada-spec.c (count_ada_macro, store_ada_macro): Use cpp_user_macro_p.
	* c-ppoutput.c (cb_used_define, dump_macro): Likewise.
	* c-spellcheck.cc (should_suggest_as_macro_p): Likewise.
	gcc/
	* config/powerpcspe/powerpcspe-c.c (rs6000_macro_to_expand): Adjust.
	* config/rs6000/rs6000-c.c (rs6000_macro_to_expand): Adjust.
	gcc/cp/
	* name-lookup.c (lookup_name_fuzzy): Use cpp_user_macro_p.
	gcc/fortran/
	* cpp.c (dump_macro): Use cpp_user_macro_p.

From-SVN: r263430
---

diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup
index 91d282159f1a..1b5ad7695021 100644
--- a/ChangeLog.name-lookup
+++ b/ChangeLog.name-lookup
@@ -1,5 +1,44 @@
 2018-08-08  Nathan Sidwell  <nathan@acm.org>
 
+	libcpp/
+	* include/cpplib.h (enum node_type): Rename to NT_USER_MACR,
+	NT_BUILTIN_MACRO.
+	(CPP_HASNODE_VALUE_IDX): Delete.
+	(union _cpp_hashnode_value): Adjust.
+	(struct cpp_hashnode): Likewise.
+	(cpp_macro_p, cpp_user_macro_p, cpp_builtin_macro_p): New.
+	* internal.h (_cpp_mark_macro_used): Use cpp_user_macro_p.
+	* directives.c (do_undef, do_pragma_poison, do_ifdef, do_ifndef)
+	(cpp_pop_definition): Use cpp_macro_p and friends.
+	(doassert): Adjust.
+	* expr.c (parse_defined): Use cpp_macro_p.
+	* files.c (should_stack_file): Likewise.
+	* identifiers.c (cpp_defined): Likewise.
+	* init.c (cpp_init_special_builtins): Adjust.
+	* lex.c (is_macro): Use cpp_macro_p.
+	* macro.c (cpp_warn_if_unused_macro, enter_macro_context)
+	(warn_of_redefinition, _cpp_create_definition): Use cpp_macro_p
+	and friends.
+	(_cpp_notify_macro_use): Adjust.
+	(cpp_macro_p): Delete old definition.
+	(cp_fun_like_macro_p): Use cpp_user_macro_p.
+	(cpp_macro_definition): Likewise.
+	* pch.c (write_macdef, count_defs, write_defs, save_macros): Adjust.
+	* traditional.c (fun_loke_macro, maybe_start_funlike)
+	(_cpp_scan_out_logical_line, push_replacement_text): Use
+	cpp_macro_p and friends.
+	gcc/c-family/
+	* c-ada-spec.c (count_ada_macro, store_ada_macro): Use cpp_user_macro_p.
+	* c-ppoutput.c (cb_used_define, dump_macro): Likewise.
+	* c-spellcheck.cc (should_suggest_as_macro_p): Likewise.
+	gcc/
+	* config/powerpcspe/powerpcspe-c.c (rs6000_macro_to_expand): Adjust.
+	* config/rs6000/rs6000-c.c (rs6000_macro_to_expand): Adjust.
+	gcc/cp/
+	* name-lookup.c (lookup_name_fuzzy): Use cpp_user_macro_p.
+	gcc/fortran/
+	* cpp.c (dump_macro): Use cpp_user_macro_p.
+
 	libcpp/
 	* internal.h (_cpp_notify_macro_use): Declare.
 	(_cpp_maybe_notify_macro_use): Define.
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 0d432f97ea9f..d987effe72b8 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -171,7 +171,7 @@ static int
 count_ada_macro (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *node,
 		 void *v ATTRIBUTE_UNUSED)
 {
-  if (cpp_macro_p (node) && *NODE_NAME (node) != '_')
+  if (cpp_user_macro_p (node) && *NODE_NAME (node) != '_')
     {
       const cpp_macro *macro = node->value.macro;
       if (macro->count && LOCATION_FILE (macro->line) == macro_source_file)
@@ -189,7 +189,7 @@ static int
 store_ada_macro (cpp_reader *pfile ATTRIBUTE_UNUSED,
 		 cpp_hashnode *node, void *macros)
 {
-  if (cpp_macro_p (node) && *NODE_NAME (node) != '_')
+  if (cpp_user_macro_p (node) && *NODE_NAME (node) != '_')
     {
       const cpp_macro *macro = node->value.macro;
       if (macro->count
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index 9be72da1dd8e..b183d98f0726 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -532,7 +532,7 @@ static void
 cb_used_define (cpp_reader *pfile, source_location line ATTRIBUTE_UNUSED,
 		cpp_hashnode *node)
 {
-  if (cpp_macro_p (node))
+  if (cpp_user_macro_p (node))
     {
       macro_queue *q;
       q = XNEW (macro_queue);
@@ -689,7 +689,8 @@ cb_def_pragma (cpp_reader *pfile, source_location line)
 static int
 dump_macro (cpp_reader *pfile, cpp_hashnode *node, void *v ATTRIBUTE_UNUSED)
 {
-  if (cpp_macro_p (node))
+  /* asserts are distinguished by beginning with '#'.  */
+  if (cpp_user_macro_p (node) && NODE_NAME(node)[0] != '#')
     {
       fputs ("#define ", print.outf);
       fputs ((const char *) cpp_macro_definition (pfile, node),
diff --git a/gcc/c-family/c-spellcheck.cc b/gcc/c-family/c-spellcheck.cc
index f1da61eb33f0..85fd278f4ac9 100644
--- a/gcc/c-family/c-spellcheck.cc
+++ b/gcc/c-family/c-spellcheck.cc
@@ -45,12 +45,12 @@ name_reserved_for_implementation_p (const char *str)
 static bool
 should_suggest_as_macro_p (cpp_hashnode *hashnode)
 {
-  if (!cpp_macro_p (hashnode, true))
+  if (!cpp_macro_p (hashnode))
     return false;
 
   /* Don't suggest names reserved for the implementation, but do
      suggest the builtin macros such as __FILE__, __LINE__ etc.  */
-  if (cpp_macro_p (hashnode, false)
+  if (cpp_user_macro_p (hashnode)
       && name_reserved_for_implementation_p ((const char *)hashnode->ident.str))
     return false;
 
diff --git a/gcc/config/powerpcspe/powerpcspe-c.c b/gcc/config/powerpcspe/powerpcspe-c.c
index 9b8f698a79ce..0e69ebb994f1 100644
--- a/gcc/config/powerpcspe/powerpcspe-c.c
+++ b/gcc/config/powerpcspe/powerpcspe-c.c
@@ -220,7 +220,7 @@ rs6000_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
       else if (ident && (ident != C_CPP_HASHNODE (__vector_keyword)))
 	{
 	  enum rid rid_code = (enum rid)(ident->rid_code);
-	  bool is_macro = cpp_macro_p (ident, true);
+	  bool is_macro = cpp_macro_p (ident);
 
 	  /* If there is a function-like macro, check if it is going to be
 	     invoked with or without arguments.  Without following ( treat
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 02e606c03138..4d5e3c226abb 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -220,7 +220,7 @@ rs6000_macro_to_expand (cpp_reader *pfile, const cpp_token *tok)
       else if (ident && (ident != C_CPP_HASHNODE (__vector_keyword)))
 	{
 	  enum rid rid_code = (enum rid)(ident->rid_code);
-	  bool is_macro = cpp_macro_p (ident, true);
+	  bool is_macro = cpp_macro_p (ident);
 
 	  /* If there is a function-like macro, check if it is going to be
 	     invoked with or without arguments.  Without following ( treat
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 87304b9aa6a1..b0aaa4c478ac 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -5925,10 +5925,10 @@ lookup_name_fuzzy (tree name, enum lookup_name_fuzzy_kind kind, location_t loc)
       /* If we have an exact match for a macro name, then either the
 	 macro was used with the wrong argument count, or the macro
 	 has been used before it was defined.  */
-      cpp_hashnode *macro = bmm.blithely_get_best_candidate ();
-      if (macro && cpp_macro_p (macro))
-	return name_hint (NULL,
-			  macro_use_before_def::maybe_make (loc, macro));
+      if (cpp_hashnode *macro = bmm.blithely_get_best_candidate ())
+	if (cpp_user_macro_p (macro))
+	  return name_hint (NULL,
+			    macro_use_before_def::maybe_make (loc, macro));
     }
 
   /* Try the "starts_decl_specifier_p" keywords to detect
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index b60a3deaaefd..fa5c869ceea8 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -990,7 +990,7 @@ cb_include (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location line,
 static int
 dump_macro (cpp_reader *pfile, cpp_hashnode *node, void *v ATTRIBUTE_UNUSED)
 {
-  if (cpp_macro_p (node))
+  if (cpp_user_macro_p (node))
     {
       fputs ("#define ", print.outf);
       fputs ((const char *) cpp_macro_definition (pfile, node),
diff --git a/libcpp/directives.c b/libcpp/directives.c
index 35055872771d..a12688c0afca 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -665,12 +665,12 @@ do_undef (cpp_reader *pfile)
 
       /* 6.10.3.5 paragraph 2: [#undef] is ignored if the specified
 	 identifier is not currently defined as a macro name.  */
-      if (node->type & NT_MACRO)
+      if (cpp_macro_p (node))
 	{
 	  if (node->flags & NODE_WARN)
 	    cpp_error (pfile, CPP_DL_WARNING,
 		       "undefining \"%s\"", NODE_NAME (node));
-	  else if ((node->type == NT_BUILTIN)
+	  else if (cpp_builtin_macro_p (node)
 		   && CPP_OPTION (pfile, warn_builtin_macro_redefined))
 	    cpp_warning_with_line (pfile, CPP_W_BUILTIN_MACRO_REDEFINED,
 				   pfile->directive_line, 0,
@@ -1666,7 +1666,7 @@ do_pragma_poison (cpp_reader *pfile)
       if (hp->flags & NODE_POISONED)
 	continue;
 
-      if (hp->type & NT_MACRO)
+      if (cpp_macro_p (hp))
 	cpp_error (pfile, CPP_DL_WARNING, "poisoning existing macro \"%s\"",
 		   NODE_NAME (hp));
       _cpp_free_definition (hp);
@@ -1960,8 +1960,7 @@ do_ifdef (cpp_reader *pfile)
 	     the powerpc and spu ports using conditional macros for 'vector',
 	     'bool', and 'pixel' to act as conditional keywords.  This messes
 	     up tests like #ifndef bool.  */
-	  skip = (node->type == NT_VOID
-		  || ((node->flags & NODE_CONDITIONAL) != 0));
+	  skip = !cpp_macro_p (node) || (node->flags & NODE_CONDITIONAL);
 	  _cpp_mark_macro_used (node);
 	  _cpp_maybe_notify_macro_use (pfile, node);
 	  if (pfile->cb.used)
@@ -1990,8 +1989,8 @@ do_ifndef (cpp_reader *pfile)
 	     the powerpc and spu ports using conditional macros for 'vector',
 	     'bool', and 'pixel' to act as conditional keywords.  This messes
 	     up tests like #ifndef bool.  */
-	  skip = (node->type != NT_VOID
-		  && ((node->flags & NODE_CONDITIONAL) == 0));
+	  skip = (cpp_macro_p (node)
+		  && !(node->flags & NODE_CONDITIONAL));
 	  _cpp_mark_macro_used (node);
 	  _cpp_maybe_notify_macro_use (pfile, node);
 	  if (pfile->cb.used)
@@ -2330,7 +2329,7 @@ do_assert (cpp_reader *pfile)
 
       answer->parm.next = node->value.macro;
 
-      node->type = NT_MACRO;
+      node->type = NT_USER_MACRO;
       node->value.macro = answer;
 
       check_eol (pfile, false);
@@ -2457,17 +2456,15 @@ cpp_pop_definition (cpp_reader *pfile, struct def_pragma_macro *c)
   if (pfile->cb.before_define)
     pfile->cb.before_define (pfile);
 
-  if (node->type & NT_MACRO)
+  if (cpp_macro_p (node))
     {
       if (pfile->cb.undef)
 	pfile->cb.undef (pfile, pfile->directive_line, node);
       if (CPP_OPTION (pfile, warn_unused_macros))
 	_cpp_warn_if_unused_macro (pfile, node, NULL);
+      _cpp_free_definition (node);
     }
 
-  if (node->type != NT_VOID)
-    _cpp_free_definition (node);
-
   if (c->is_undef)
     return;
 
diff --git a/libcpp/expr.c b/libcpp/expr.c
index c8882804612c..201a6197bcd3 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -1081,8 +1081,8 @@ parse_defined (cpp_reader *pfile)
   result.unsignedp = false;
   result.high = 0;
   result.overflow = false;
-  result.low = (node && node->type & NT_MACRO
-		&& (node->flags & NODE_CONDITIONAL) == 0);
+  result.low = (node && cpp_macro_p (node)
+		&& !(node->flags & NODE_CONDITIONAL));
   return result;
 }
 
diff --git a/libcpp/files.c b/libcpp/files.c
index cb044fce690e..08b7c647c914 100644
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -805,7 +805,7 @@ should_stack_file (cpp_reader *pfile, _cpp_file *file, bool import,
 
   /* Skip if the file had a header guard and the macro is defined.
      PCH relies on this appearing before the PCH handler below.  */
-  if (file->cmacro && file->cmacro->type & NT_MACRO)
+  if (file->cmacro && cpp_macro_p (file->cmacro))
     return false;
 
   /* Handle PCH files immediately; don't stack them.  */
diff --git a/libcpp/identifiers.c b/libcpp/identifiers.c
index 675194d2122c..3d42d1a6b8d0 100644
--- a/libcpp/identifiers.c
+++ b/libcpp/identifiers.c
@@ -104,8 +104,8 @@ cpp_defined (cpp_reader *pfile, const unsigned char *str, int len)
 
   node = CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_NO_INSERT));
 
-  /* If it's a macro, it cannot be poisoned.  */
-  return node && node->type & NT_MACRO;
+  /* If it's a macro, it cannot have been poisoned.  */
+  return node && cpp_macro_p (node);
 }
 
 /* We don't need a proxy since the hash table's identifier comes first
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 8a96b7174b28..8630475995ec 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -700,8 +700,8 @@ enum node_type
 {
   NT_VOID = 0,	   /* No definition yet.  */
   NT_MACRO_ARG,	   /* A macro arg.  */
-  NT_MACRO,	   /* A user macro or assert.  */
-  NT_BUILTIN	   /* A builtin macro.  */
+  NT_USER_MACRO,   /* A user macro or assert (#node).  */
+  NT_BUILTIN_MACRO /* A builtin macro.  */
 };
 
 /* Different flavors of builtin macro.  _Pragma is an operator, but we
@@ -726,30 +726,17 @@ enum cpp_builtin_type
 #define NODE_LEN(NODE)		HT_LEN (&(NODE)->ident)
 #define NODE_NAME(NODE)		HT_STR (&(NODE)->ident)
 
-/* Specify which field, if any, of the union is used.  */
-
-enum {
-  NTV_MACRO,
-  NTV_BUILTIN,
-  NTV_ARGUMENT
-};
-
-#define CPP_HASHNODE_VALUE_IDX(HNODE)				\
-  ((HNODE).type == NT_MACRO_ARG ? NTV_ARGUMENT			\
-   : (HNODE).type == NT_BUILTIN ? NTV_BUILTIN			\
-   : NTV_MACRO)
-
 /* The common part of an identifier node shared amongst all 3 C front
    ends.  Also used to store CPP identifiers, which are a superset of
    identifiers in the grammatical sense.  */
 
 union GTY(()) _cpp_hashnode_value {
   /* Macro or assert  */
-  cpp_macro * GTY((tag ("NTV_MACRO"))) macro;
+  cpp_macro * GTY((tag ("NT_USER_MACRO"))) macro;
   /* Code for a builtin macro.  */
-  enum cpp_builtin_type GTY ((tag ("NTV_BUILTIN"))) builtin;
+  enum cpp_builtin_type GTY ((tag ("NT_BUILTIN_MACRO"))) builtin;
   /* Macro argument index.  */
-  unsigned short GTY ((tag ("NTV_ARGUMENT"))) arg_index;
+  unsigned short GTY ((tag ("NT_MACRO_ARG"))) arg_index;
 };
 
 struct GTY(()) cpp_hashnode {
@@ -762,7 +749,7 @@ struct GTY(()) cpp_hashnode {
   ENUM_BITFIELD(node_type) type : 6;	/* CPP node type.  */
   unsigned int flags : 10;		/* CPP flags.  */
 
-  union _cpp_hashnode_value GTY ((desc ("CPP_HASHNODE_VALUE_IDX (%1)"))) value;
+  union _cpp_hashnode_value GTY ((desc ("%1.type"))) value;
 };
 
 /* A class for iterating through the source locations within a
@@ -883,7 +870,23 @@ extern int cpp_avoid_paste (cpp_reader *, const cpp_token *,
 extern const cpp_token *cpp_get_token (cpp_reader *);
 extern const cpp_token *cpp_get_token_with_location (cpp_reader *,
 						     source_location *);
-extern bool cpp_macro_p (cpp_hashnode *node, bool builtin_ok = false);
+/* Although a macro may actually turn out to be an assert, they are
+   separated by namespace, in that the latter have special
+   '#'-starting names, that macros cannot have.  We don't have to
+   check that.  */
+inline bool cpp_user_macro_p (const cpp_hashnode *node)
+{
+  return node->type == NT_USER_MACRO;
+}
+inline bool cpp_builtin_macro_p (const cpp_hashnode *node)
+{
+  return node->type == NT_BUILTIN_MACRO;
+}
+inline bool cpp_macro_p (const cpp_hashnode *node)
+{
+  return node->type & NT_USER_MACRO;
+}
+
 extern bool cpp_fun_like_macro_p (cpp_hashnode *);
 extern const unsigned char *cpp_macro_definition (cpp_reader *,
 						  cpp_hashnode *);
diff --git a/libcpp/init.c b/libcpp/init.c
index 1f6a2bb1b799..32a595651743 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -480,7 +480,7 @@ cpp_init_special_builtins (cpp_reader *pfile)
 	      || pfile->cb.has_attribute == NULL))
 	continue;
       cpp_hashnode *hp = cpp_lookup (pfile, b->name, b->len);
-      hp->type = NT_BUILTIN;
+      hp->type = NT_BUILTIN_MACRO;
       if (b->always_warn_if_redefined)
 	hp->flags |= NODE_WARN;
       hp->value.builtin = (enum cpp_builtin_type) b->value;
diff --git a/libcpp/internal.h b/libcpp/internal.h
index e03b2ea3681c..d63a3db9a3c5 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -93,9 +93,8 @@ struct dummy
 #define CPP_ALIGN2(size, align) (((size) + ((align) - 1)) & ~((align) - 1))
 #define CPP_ALIGN(size) CPP_ALIGN2 (size, DEFAULT_ALIGNMENT)
 
-#define _cpp_mark_macro_used(NODE) do {					\
-  if ((NODE)->type == NT_MACRO)		\
-    (NODE)->value.macro->used = 1; } while (0)
+#define _cpp_mark_macro_used(NODE) 					\
+  (cpp_user_macro_p (NODE) ? (NODE)->value.macro->used = 1 : 0)
 
 /* A generic memory buffer, and operations on it.  */
 typedef struct _cpp_buff _cpp_buff;
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 1f6fe687173d..892cfc4494de 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1627,7 +1627,7 @@ is_macro(cpp_reader *pfile, const uchar *base)
   cpp_hashnode *result = CPP_HASHNODE (ht_lookup_with_hash (pfile->hash_table,
 					base, cur - base, hash, HT_NO_INSERT));
 
-  return result ? result->type & NT_MACRO : false;
+  return result && cpp_macro_p (result);
 }
 
 /* Returns true if a literal suffix does not have the expected form
diff --git a/libcpp/macro.c b/libcpp/macro.c
index e88a5885fc81..2d830160308a 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -342,7 +342,7 @@ int
 _cpp_warn_if_unused_macro (cpp_reader *pfile, cpp_hashnode *node,
 			   void *v ATTRIBUTE_UNUSED)
 {
-  if (node->type == NT_MACRO)
+  if (cpp_user_macro_p (node))
     {
       cpp_macro *macro = node->value.macro;
 
@@ -1274,7 +1274,7 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node,
      function where set this flag to FALSE.  */
   pfile->about_to_expand_macro_p = true;
 
-  if (node->type == NT_MACRO)
+  if (cpp_user_macro_p (node))
     {
       cpp_macro *macro = node->value.macro;
       _cpp_buff *pragma_buff = NULL;
@@ -1401,7 +1401,7 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node,
 
     if (/* The top-level macro invocation that triggered the expansion
 	   we are looking at is with a standard macro ...  */
-	pfile->top_most_macro_node->type == NT_MACRO
+	cpp_user_macro_p (pfile->top_most_macro_node)
 	/* ... and it's a function-like macro invocation,  */
 	&& pfile->top_most_macro_node->value.macro->fun_like
 	/* ... and we are tracking the macro expansion.  */
@@ -2991,7 +2991,7 @@ warn_of_redefinition (cpp_reader *pfile, cpp_hashnode *node,
 
   /* Suppress warnings for builtins that lack the NODE_WARN flag,
      unless Wbuiltin-macro-redefined.  */
-  if (node->type == NT_BUILTIN)
+  if (cpp_builtin_macro_p (node))
     return CPP_OPTION (pfile, warn_builtin_macro_redefined);
 
   /* Redefinitions of conditional (context-sensitive) macros, on
@@ -3508,23 +3508,23 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node)
   if (!macro)
     return false;
 
-  if (node->type & NT_MACRO)
+  if (cpp_macro_p (node))
     {
       if (CPP_OPTION (pfile, warn_unused_macros))
 	_cpp_warn_if_unused_macro (pfile, node, NULL);
 
       if (warn_of_redefinition (pfile, node, macro))
 	{
-          const int reason = ((node->type == NT_BUILTIN)
-			      && !(node->flags & NODE_WARN))
-                             ? CPP_W_BUILTIN_MACRO_REDEFINED : CPP_W_NONE;
+          const int reason
+	    = (cpp_builtin_macro_p (node) && !(node->flags & NODE_WARN))
+	    ? CPP_W_BUILTIN_MACRO_REDEFINED : CPP_W_NONE;
 
 	  bool warned = 
 	    cpp_pedwarning_with_line (pfile, reason,
 				      pfile->directive_line, 0,
 				      "\"%s\" redefined", NODE_NAME (node));
 
-	  if (warned && node->type == NT_MACRO)
+	  if (warned && cpp_user_macro_p (node))
 	    cpp_error_with_line (pfile, CPP_DL_NOTE,
 				 node->value.macro->line, 0,
 			 "this is the location of the previous definition");
@@ -3533,7 +3533,7 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node)
     }
 
   /* Enter definition in hash table.  */
-  node->type = NT_MACRO;
+  node->type = NT_USER_MACRO;
   node->value.macro = macro;
   if (! ustrncmp (NODE_NAME (node), DSC ("__STDC_"))
       && ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_FORMAT_MACROS")
@@ -3571,7 +3571,7 @@ _cpp_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node)
   node->flags |= NODE_USED;
   switch (node->type)
     {
-    case NT_MACRO:
+    case NT_USER_MACRO:
       {
 	cpp_macro *macro = node->value.macro;
 	if (macro->lazy)
@@ -3582,7 +3582,7 @@ _cpp_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node)
       }
       /* FALLTHROUGH.  */
 
-    case NT_BUILTIN:
+    case NT_BUILTIN_MACRO:
       if (pfile->cb.used_define)
 	pfile->cb.used_define (pfile, pfile->directive_line, node);
       break;
@@ -3639,24 +3639,11 @@ check_trad_stringification (cpp_reader *pfile, const cpp_macro *macro,
     }
 }
 
-/* Returns true if NODE is a macro.  */
-bool
-cpp_macro_p (cpp_hashnode *node, bool builtin_ok)
-{
-  if (node->type == NT_BUILTIN)
-    return builtin_ok;
-
-  if (node->type == NT_MACRO)
-    return node->value.macro->kind != cmk_assert;
-
-  return false;
-}
-
 /* Returns true if NODE is a function-like macro.  */
 bool
 cpp_fun_like_macro_p (cpp_hashnode *node)
 {
-  return cpp_macro_p (node) && node->value.macro->fun_like;
+  return cpp_user_macro_p (node) && node->value.macro->fun_like;
 }
 
 /* Returns the name, arguments and expansion of a macro, in a format
@@ -3670,7 +3657,7 @@ cpp_macro_definition (cpp_reader *pfile, cpp_hashnode *node)
   unsigned int i, len;
   unsigned char *buffer;
 
-  gcc_checking_assert (node->type == NT_MACRO);
+  gcc_checking_assert (cpp_user_macro_p (node));
 
   const cpp_macro *macro = node->value.macro;
 
diff --git a/libcpp/pch.c b/libcpp/pch.c
index d75f5694c489..de86dde1bfb7 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -59,10 +59,10 @@ write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
       is_void = true;
       goto poisoned;
 
-    case NT_BUILTIN:
+    case NT_BUILTIN_MACRO:
       return 1;
 
-    case NT_MACRO:
+    case NT_USER_MACRO:
       if (hn->value.macro->kind != cmk_assert)
 	{
 	poisoned:
@@ -225,10 +225,10 @@ count_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 
   switch (hn->type)
     {
-    case NT_BUILTIN:
+    case NT_BUILTIN_MACRO:
       return 1;
 
-    case NT_MACRO:
+    case NT_USER_MACRO:
       if (hn->value.macro->kind == cmk_assert)
 	return 1;
 
@@ -263,10 +263,10 @@ write_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 
   switch (hn->type)
     {
-    case NT_BUILTIN:
+    case NT_BUILTIN_MACRO:
       return 1;
 
-    case NT_MACRO:
+    case NT_USER_MACRO:
       if (hn->value.macro->kind == cmk_assert)
 	return 1;
 
@@ -755,8 +755,7 @@ save_macros (cpp_reader *r, cpp_hashnode *h, void *data_p)
 {
   struct save_macro_data *data = (struct save_macro_data *)data_p;
 
-  if (h->type == NT_MACRO
-      && h->value.macro->kind != cmk_assert)
+  if (cpp_user_macro_p (h) && h->value.macro->kind != cmk_assert)
     {
       if (data->count == data->array_size)
 	{
diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index b64b65fc3dae..94c1f7b712f1 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -325,7 +325,7 @@ _cpp_read_logical_line_trad (cpp_reader *pfile)
 static inline bool
 fun_like_macro (cpp_hashnode *node)
 {
-  if (node->type == NT_BUILTIN)
+  if (cpp_builtin_macro_p (node))
     return node->value.builtin == BT_HAS_ATTRIBUTE;
   else
     return node->value.macro->fun_like;
@@ -338,7 +338,7 @@ maybe_start_funlike (cpp_reader *pfile, cpp_hashnode *node, const uchar *start,
 		     struct fun_macro *macro)
 {
   unsigned int n;
-  if (node->type == NT_BUILTIN)
+  if (cpp_builtin_macro_p (node))
     n = 1;
   else
     n = node->value.macro->paramc;
@@ -521,7 +521,7 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro,
 	      out = pfile->out.cur;
 	      cur = CUR (context);
 
-	      if (node->type & NT_MACRO
+	      if (cpp_macro_p (node)
 		  /* Should we expand for ls_answer?  */
 		  && (lex_state == ls_none || lex_state == ls_fun_open)
 		  && !pfile->state.prevent_expansion)
@@ -610,7 +610,7 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro,
 	      paren_depth--;
 	      if (lex_state == ls_fun_close && paren_depth == 0)
 		{
-		  if (fmacro.node->type == NT_BUILTIN)
+		  if (cpp_builtin_macro_p (fmacro.node))
 		    {
 		      /* Handle builtin function-like macros like
 			 __has_attribute.  The already parsed arguments
@@ -839,7 +839,7 @@ push_replacement_text (cpp_reader *pfile, cpp_hashnode *node)
   const uchar *text;
   uchar *buf;
 
-  if (node->type == NT_BUILTIN)
+  if (cpp_builtin_macro_p (node))
     {
       text = _cpp_builtin_macro_text (pfile, node);
       len = ustrlen (text);