diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-06-02 13:23:08 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-06-02 13:23:08 +0000 |
| commit | 030cfa22cbaaa97f54b74e0fba19fbe09367b481 (patch) | |
| tree | b860dbc9fa66af625ee6f7a4ef8cef3e9b0557fd /gcc/cp/decl.c | |
| parent | 9186a9d353815352d9625fc765dd0449fb64d8a9 (diff) | |
| download | gcc-030cfa22cbaaa97f54b74e0fba19fbe09367b481.zip gcc-030cfa22cbaaa97f54b74e0fba19fbe09367b481.tar.gz gcc-030cfa22cbaaa97f54b74e0fba19fbe09367b481.tar.bz2 | |
Remove lang_type_ptrmem.
cp/
Remove lang_type_ptrmem.
* cp-tree.h (lang_type_header): Remove is_lang_type_class. Move
into ...
(lang_type_class): ... this. Reorder bitfields. Rename to ...
(lang_type): ... this. Delete old definition.
(lang_type_ptrmem): Delete.
(LANG_TYPE_CLASS_CHECK): Simply get TYPE_LANG_SPECIFIC. Adjust
uses.
(LANG_TYPE_PTRMEM_CHECK): Delete.
(TYPE_GET_PTRMEMFUNC_TYPE, TYPE_SET_PTRMEMFUNC_TYPE): Delete.
(TYPE_PTRMEMFUNC_TYPE): New. Use TYPE_LANG_SLOT_1.
* decl.c (build_ptrmemfunc_type): Adjust.
* lex.c (copy_lang_type): Remove lang_type_ptrmem handling.
(maybe_add_lang_type_raw): Don't set u.c.h.is_lang_type_class.
objcp/
* objcp-decl.h (SIZEOF_OBJC_TYPE_LANG_SPECIFIC): Use lang_type.
(ALLOC_OBJC_TYPE_LANG_SPECIFIC): Use it. Don't set
u.c.h.is_lang_type_class.
From-SVN: r248826
Diffstat (limited to 'gcc/cp/decl.c')
| -rw-r--r-- | gcc/cp/decl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e895fa7..b144426 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9154,7 +9154,9 @@ build_ptrmemfunc_type (tree type) this method instead of type_hash_canon, because it only does a simple equality check on the list of field members. */ - if ((t = TYPE_GET_PTRMEMFUNC_TYPE (type))) + + t = TYPE_PTRMEMFUNC_TYPE (type); + if (t) return t; t = make_node (RECORD_TYPE); @@ -9178,7 +9180,7 @@ build_ptrmemfunc_type (tree type) /* Cache this pointer-to-member type so that we can find it again later. */ - TYPE_SET_PTRMEMFUNC_TYPE (type, t); + TYPE_PTRMEMFUNC_TYPE (type) = t; if (TYPE_STRUCTURAL_EQUALITY_P (type)) SET_TYPE_STRUCTURAL_EQUALITY (t); |