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/objcp | |
| 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/objcp')
| -rw-r--r-- | gcc/objcp/objcp-decl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/objcp/objcp-decl.h b/gcc/objcp/objcp-decl.h index 0c4f67a..2da7e71 100644 --- a/gcc/objcp/objcp-decl.h +++ b/gcc/objcp/objcp-decl.h @@ -62,14 +62,11 @@ extern tree objcp_end_compound_stmt (tree, int); #undef TYPE_OBJC_INFO #define TYPE_OBJC_INFO(TYPE) LANG_TYPE_CLASS_CHECK (TYPE)->objc_info #undef SIZEOF_OBJC_TYPE_LANG_SPECIFIC -#define SIZEOF_OBJC_TYPE_LANG_SPECIFIC sizeof (struct lang_type_class) +#define SIZEOF_OBJC_TYPE_LANG_SPECIFIC sizeof (struct lang_type) #undef ALLOC_OBJC_TYPE_LANG_SPECIFIC -#define ALLOC_OBJC_TYPE_LANG_SPECIFIC(NODE) \ - do { \ - TYPE_LANG_SPECIFIC (NODE) = (struct lang_type *) \ - ggc_internal_cleared_alloc (sizeof (struct lang_type_class)); \ - TYPE_LANG_SPECIFIC (NODE)->u.c.h.is_lang_type_class = 1; \ - } while (0) +#define ALLOC_OBJC_TYPE_LANG_SPECIFIC(NODE) \ + (TYPE_LANG_SPECIFIC (NODE) = (struct lang_type *) \ + ggc_internal_cleared_alloc (SIZEOF_OBJC_TYPE_LANG_SPECIFIC)) #define OBJCP_ORIGINAL_FUNCTION(name, args) (name)args |