diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-06-29 14:49:46 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-06-29 14:49:46 +0000 |
| commit | e3e6cc260a1ecceea58b0479bd184420a30c5d8f (patch) | |
| tree | 9637ddcdc81f1ba6e94bdccdcb7384c19be224d3 | |
| parent | 2de0ccc88c54a3dff484fd81138ce3c84880be1c (diff) | |
| download | gcc-e3e6cc260a1ecceea58b0479bd184420a30c5d8f.zip gcc-e3e6cc260a1ecceea58b0479bd184420a30c5d8f.tar.gz gcc-e3e6cc260a1ecceea58b0479bd184420a30c5d8f.tar.bz2 | |
cp-tree.h (THIS_NAME, [...]): Delete.
* cp-tree.h (THIS_NAME, IN_CHARGE_NAME, VTBL_PTR_TYPE,
VTABLE_DELTA_NAME, VTABLE_PFN_NAME): Delete.
* decl.c (initialize_predefined_identifiers): Name cdtor special
names consistently. Use literals for above deleted defines.
(cxx_init_decl_processing): Use literal for vtbl_ptr_type name,
From-SVN: r249791
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 8 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 20 |
3 files changed, 16 insertions, 18 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eefc3f0..9281c61 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2017-06-29 Nathan Sidwell <nathan@acm.org> + * cp-tree.h (THIS_NAME, IN_CHARGE_NAME, VTBL_PTR_TYPE, + VTABLE_DELTA_NAME, VTABLE_PFN_NAME): Delete. + * decl.c (initialize_predefined_identifiers): Name cdtor special + names consistently. Use literals for above deleted defines. + (cxx_init_decl_processing): Use literal for vtbl_ptr_type name, + * lex.c (maybe_add_lang_type_raw): Exit early, rather than use a flag. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 6717bcb..435a23a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5195,14 +5195,6 @@ extern GTY(()) vec<tree, va_gc> *keyed_classes; #endif /* NO_DOLLAR_IN_LABEL */ #endif /* NO_DOT_IN_LABEL */ -#define THIS_NAME "this" - -#define IN_CHARGE_NAME "__in_chrg" - -#define VTBL_PTR_TYPE "__vtbl_ptr_type" -#define VTABLE_DELTA_NAME "__delta" -#define VTABLE_PFN_NAME "__pfn" - #define LAMBDANAME_PREFIX "__lambda" #define LAMBDANAME_FORMAT LAMBDANAME_PREFIX "%d" diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c6b1f07..5026075 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3955,16 +3955,16 @@ initialize_predefined_identifiers (void) /* Some of these names have a trailing space so that it is impossible for them to conflict with names written by users. */ {"__ct ", &ctor_identifier, cik_ctor}, - {"__base_ctor ", &base_ctor_identifier, cik_ctor}, - {"__comp_ctor ", &complete_ctor_identifier, cik_ctor}, + {"__ct_base ", &base_ctor_identifier, cik_ctor}, + {"__ct_comp ", &complete_ctor_identifier, cik_ctor}, {"__dt ", &dtor_identifier, cik_dtor}, - {"__comp_dtor ", &complete_dtor_identifier, cik_dtor}, - {"__base_dtor ", &base_dtor_identifier, cik_dtor}, - {"__deleting_dtor ", &deleting_dtor_identifier, cik_dtor}, - {IN_CHARGE_NAME, &in_charge_identifier, cik_normal}, - {THIS_NAME, &this_identifier, cik_normal}, - {VTABLE_DELTA_NAME, &delta_identifier, cik_normal}, - {VTABLE_PFN_NAME, &pfn_identifier, cik_normal}, + {"__dt_base ", &base_dtor_identifier, cik_dtor}, + {"__dt_comp ", &complete_dtor_identifier, cik_dtor}, + {"__dt_del ", &deleting_dtor_identifier, cik_dtor}, + {"__in_chrg", &in_charge_identifier, cik_normal}, + {"this", &this_identifier, cik_normal}, + {"__delta", &delta_identifier, cik_normal}, + {"__pfn", &pfn_identifier, cik_normal}, {"_vptr", &vptr_identifier, cik_normal}, {"__vtt_parm", &vtt_parm_identifier, cik_normal}, {"::", &global_identifier, cik_normal}, @@ -4094,7 +4094,7 @@ cxx_init_decl_processing (void) vtable_entry_type = build_pointer_type (vfunc_type); } - record_builtin_type (RID_MAX, VTBL_PTR_TYPE, vtable_entry_type); + record_builtin_type (RID_MAX, "__vtbl_ptr_type", vtable_entry_type); vtbl_type_node = build_cplus_array_type (vtable_entry_type, NULL_TREE); |