[CPP PATCH] node type

https://gcc.gnu.org/ml/gcc-patches/2018-08/msg01164.html
	* include/cpplib.h (NODE_BUILTIN, NODE_MACRO_ARG): Delete.
	Renumber others.
	(enum node_type): Replace NT_MACRO with NT_USER_MACRO,
	NT_BUILTIN_MACRO, NT_MACRO_ARG.  Delete NT_ASSERTION.
	(NTV_MACRO, NTV_ANSWER, NTV_BUILTIN, NTV_ARGUMENT, NTV_NONE):
	Delete.
	(CPP_HASHNODE_VALUE_IDX): Delete.
	(union _cpp_hashnode_value): GTY tag from enum node_type directly.
	(struct cpp_hashnode): Adjust GTY desc for value field.
	(cpp_user_macro_p, cpp_builtin_macro_p, cpp_macro_p): Adjust.
	* directives.c (undefine_macros): Clear value.anwers, adjust flag
	clearing.
	(_cpp_test_assertion): No need to check NT_ASSERTION.
	(do_assert, do_unassert): Likewise.
	* init.c (cpp_init_special_builtins): Set type not flags.
	* macro.c (struct macro_arg_saved_data): Add type field.
	(cpp_get_token_1): Check type not NT_VOID.
	(_cpp_free_definition): Adjust flag clearing.  Nullify
	value.answers.
	(_cpp_save_parameter, _cpp_unsave_parameters): Save and restore
	type.
	(lex_expansion_token): Check type not flags.
	(_cpp_create_definition): Set type to NT_USER_MACRO.
	(_cpp_notify_macro_use): Adjust type checking.
	* pch.c (write_macdef, count_defs, write_defs, cpp_valid_state)
	(save_macros): Adjust node type/flag handling.
	* traditional.c (_cpp_scan_out_logical_line): Check type not flags.

From-SVN: r263667

1 files changed, 48 insertions, 66 deletions

diff --git a/libcpp/pch.c b/libcpp/pch.c
index 47b99c1..04d7094 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -50,48 +50,47 @@ static int
 write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
 {
   FILE *f = (FILE *) file_p;
+  bool is_void = false;
   switch (hn->type)
     {
     case NT_VOID:
       if (! (hn->flags & NODE_POISONED))
 	return 1;
-      /* XXX Really fallthru?  */
-      /* FALLTHRU */
+      is_void = true;
+      goto poisoned;
 
-    case NT_MACRO:
-      if (hn->flags & NODE_BUILTIN)
-	return 1;
-
-      {
-	struct macrodef_struct s;
-	const unsigned char *defn;
+    case NT_BUILTIN_MACRO:
+      return 1;
 
-	s.name_length = NODE_LEN (hn);
-	s.flags = hn->flags & NODE_POISONED;
+    case NT_USER_MACRO:
+      if (hn->value.macro->kind != cmk_assert)
+	{
+	poisoned:
+	  struct macrodef_struct s;
+	  const unsigned char *defn;
 
-	if (hn->type == NT_MACRO)
-	  {
-	    defn = cpp_macro_definition (pfile, hn);
-	    s.definition_length = ustrlen (defn);
-	  }
-	else
-	  {
-	    defn = NODE_NAME (hn);
-	    s.definition_length = s.name_length;
-	  }
+	  s.name_length = NODE_LEN (hn);
+	  s.flags = hn->flags & NODE_POISONED;
 
-	if (fwrite (&s, sizeof (s), 1, f) != 1
-	    || fwrite (defn, 1, s.definition_length, f) != s.definition_length)
-	  {
-	    cpp_errno (pfile, CPP_DL_ERROR,
-		       "while writing precompiled header");
-	    return 0;
-	  }
-      }
-      return 1;
+	  if (is_void)
+	    {
+	      defn = NODE_NAME (hn);
+	      s.definition_length = s.name_length;
+	    }
+	  else
+	    {
+	      defn = cpp_macro_definition (pfile, hn);
+	      s.definition_length = ustrlen (defn);
+	    }
 
-    case NT_ASSERTION:
-      /* Not currently implemented.  */
+	  if (fwrite (&s, sizeof (s), 1, f) != 1
+	      || fwrite (defn, 1, s.definition_length, f) != s.definition_length)
+	    {
+	      cpp_errno (pfile, CPP_DL_ERROR,
+			 "while writing precompiled header");
+	      return 0;
+	    }
+	}
       return 1;
 
     default:
@@ -226,8 +225,11 @@ count_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 
   switch (hn->type)
     {
-    case NT_MACRO:
-      if (hn->flags & NODE_BUILTIN)
+    case NT_BUILTIN_MACRO:
+      return 1;
+
+    case NT_USER_MACRO:
+      if (hn->value.macro->kind == cmk_assert)
 	return 1;
 
       /* fall through.  */
@@ -248,10 +250,6 @@ count_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
       }
       return 1;
 
-    case NT_ASSERTION:
-      /* Not currently implemented.  */
-      return 1;
-
     default:
       abort ();
     }
@@ -265,8 +263,11 @@ write_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 
   switch (hn->type)
     {
-    case NT_MACRO:
-      if (hn->flags & NODE_BUILTIN)
+    case NT_BUILTIN_MACRO:
+      return 1;
+
+    case NT_USER_MACRO:
+      if (hn->value.macro->kind == cmk_assert)
 	return 1;
 
       /* fall through.  */
@@ -287,10 +288,6 @@ write_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
       }
       return 1;
 
-    case NT_ASSERTION:
-      /* Not currently implemented.  */
-      return 1;
-
     default:
       abort ();
     }
@@ -621,7 +618,7 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
 	  goto fail;
 	}
 
-      if (h->type != NT_MACRO)
+      if (h->type == NT_VOID)
 	{
 	  /* It's ok if __GCC_HAVE_DWARF2_CFI_ASM becomes undefined,
 	     as in, when the PCH file is created with -g and we're
@@ -758,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_VOID
-      && (h->flags & NODE_BUILTIN) == 0)
+  if (cpp_user_macro_p (h))
     {
       if (data->count == data->array_size)
 	{
@@ -767,28 +763,14 @@ save_macros (cpp_reader *r, cpp_hashnode *h, void *data_p)
 	  data->defns = XRESIZEVEC (uchar *, data->defns, (data->array_size));
 	}
 
-      switch (h->type)
-	{
-	case NT_ASSERTION:
-	  /* Not currently implemented.  */
-	  return 1;
-
-	case NT_MACRO:
-	  {
-	    const uchar * defn = cpp_macro_definition (r, h);
-	    size_t defnlen = ustrlen (defn);
+      const uchar * defn = cpp_macro_definition (r, h);
+      size_t defnlen = ustrlen (defn);
 
-	    data->defns[data->count] = (uchar *) xmemdup (defn, defnlen,
-                                                          defnlen + 2);
-	    data->defns[data->count][defnlen] = '\n';
-	  }
-	  break;
-
-	default:
-	  abort ();
-	}
+      data->defns[data->count] = (uchar *) xmemdup (defn, defnlen, defnlen + 2);
+      data->defns[data->count][defnlen] = '\n';
       data->count++;
     }
+
   return 1;
 }