Merge trunk r263669.

From-SVN: r263670

ChangeLog.name-lookup

 2018-08-20  Nathan Sidwell  <nathan@acm.org>
 
+	Merge trunk r263669.
+
 	Merge trunk r263667.
 
 	Merge trunk r263658.

libcpp/ChangeLog

 2018-08-20  Nathan Sidwell  <nathan@acm.org>
 
+	* include/cpplib.h: Fixup some whitespace.
+	(cpp_hashnode): Reduce type to 2 bit & flags to 8.
+
 	* include/cpplib.h (NODE_BUILTIN, NODE_MACRO_ARG): Delete.
 	Renumber others.
 	(enum node_type): Replace NT_MACRO with NT_USER_MACRO,

libcpp/include/cpplib.h

@@ -815,12 +815,12 @@ struct GTY(()) cpp_hashnode {
 					   Otherwise, a NODE_OPERATOR.  */
   unsigned char rid_code;		/* Rid code - for front ends.  */
   ENUM_BITFIELD(node_type) type : 2;	/* CPP node type.  */
-  unsigned int flags : 14;		/* CPP flags.  */
+  unsigned int flags : 8;		/* CPP flags.  */
 
-  /* 32-bits of padding on 64-bit arch.  We could shrink this by
-     making ht_identifier hold an offset to a trailing string value.
-     That would require FE's expose their IDENTIFIER_NODE size to
-     us.  */
+  /* 6 bits spare (plus another 32 on 64-bit hosts).  We could shrink
+     this by making ht_identifier hold an offset to a trailing string
+     value.  That would require FE's expose their IDENTIFIER_NODE size
+     to us.  */
 
   union _cpp_hashnode_value GTY ((desc ("%1.type"))) value;
 };