diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-08-20 17:49:52 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2018-08-20 17:49:52 +0000 |
| commit | b79de2a15246f0283f074bfb171e4d4be29b66f8 (patch) | |
| tree | 6f91cf18eaaac29d14855cc60be26d957f1dd903 | |
| parent | eb5fef102d1b9125de097fbf5f22e81e18cc9045 (diff) | |
| parent | 6453c738b8b3c435650f55161fc680827ab01369 (diff) | |
Merge trunk r263669.c++-name-lookup
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c++-name-lookup@263670 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.name-lookup | 2 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 3 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 10 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup index fd7fe12e117..f5ce219b25a 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 8998c0dace9..de6f5421b12 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 8b84fd76e33..5928f7ba464 100644 --- a/libcpp/include/cpplib.h +++ b/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; }; |