Merge trunk r263669.
From-SVN: r263670
diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup
index fd7fe12..f5ce219 100644
--- a/ChangeLog.name-lookup
+++ b/ChangeLog.name-lookup
@@ -1,5 +1,7 @@
2018-08-20 Nathan Sidwell <nathan@acm.org>
+ Merge trunk r263669.
+
Merge trunk r263667.
Merge trunk r263658.
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 8998c0d..de6f542 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,8 @@
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,
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 8b84fd7..5928f7b 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -815,12 +815,12 @@
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;
};
