diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-07-06 08:51:32 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-07-06 08:51:32 +0000 |
| commit | 809e3e7fece2749886700d92571232ec3faef2a0 (patch) | |
| tree | a990dca8afae963468b42e953ee838e411e88c45 /gcc/cp/tree.c | |
| parent | a95d27c83b595db1e4e428fb3b0eba12cd6e7107 (diff) | |
| download | gcc-809e3e7fece2749886700d92571232ec3faef2a0.zip gcc-809e3e7fece2749886700d92571232ec3faef2a0.tar.gz gcc-809e3e7fece2749886700d92571232ec3faef2a0.tar.bz2 | |
tree.h (TREE_VIA_VIRTUAL): Rename to ...
* tree.h (TREE_VIA_VIRTUAL): Rename to ...
(BINFO_VIRTUAL_P): ... here. Require TREE_BINFO only.
(BINFO_MARKED, BINFO_FLAG_[16]): New binfo flags.
* dbxout.c (dbxout_type): Use BINFO_VIRTUAL_P.
* dwarf2out.c (add_data_member_location_attribute): Likewise.
(gen_inheritance_die): Likewise.
* tree-dump.c (deque_and_dump): Likewise.
* doc/c-tree.texi (Binfos): Add under reconstruction note.
* cp/cp-tree.h (BINFO_MARKED): Remove.
(BINFO_VTABLE_PATH_MARKED, BINFO_NEW_VTABLE_MARKED,
BINFO_DEPENDENT_BASE_P, BINFO_LOST_PRIMARY_P,
BINFO_INDIRECT_PRIMARY_P): Use appropriate BINFO_FLAG_n.
(SET_BINFO_NEW_VTABLE_MARKED): Use BINFO_VIRTUAL_P.
* cp/class.c (build_base_path): Use BINFO_VIRTUAL_P.
(mark_primary_bases, determine_primary_base, base_derived_from,
dfs_find_final_overrider, dfs_find_final_overrider_q,
dfs_find_inal_overrider_post, update_vtable_entry_for_fn,
dfs_modify_vtables, walk_subobject_offsets,
layout_nonempty_base_or_field, build_base_field,
build_base_fields, propagate_binfo_offsets, layout_virtual_bases,
end_of_class, get_vfield_name, dump_class_hierarchy, dump_vtable,
finish_vtbls, build_vtt_inits, dfs_build_secondary_vptr_vtt_inits,
build_ctor_vtbl_group, accumulate_vtble_inits,
dfs_accumulate_vtbls_inits, build_vbase_offset_vtbl_entries,
build_vcall_offset_vtbl_entries, add_vcall_offset_vtbl_entries_r,
add_vcall_offset_vtbl_entries_1): Likewise.
* cp/decl.c (xref_basetypes): Incomming virtual base indicated by
TREE_TYPE. Adjust.
* cp/dump.c (cp_dump_tree): Use BINFO_VIRTUAL_P.
* cp/init.c (finish_init_stmts, sort_mem_initializers,
emit_mem_initializers, build_vtble_address, expand_member_init,
push_base_cleanups): Likewise.
* cp/method.c (do_build_copy_constructor): Likewise.
* cp/pt.c (instantiate_class_template,
get_template_base_recursive): Likewise.
* cp/rtti.c (dfs_class_hint_mark, get_pseudo_ti_init,
get_pseudo_ti_desc): Likewise.
* cp/search.c (lookup_base_r, dynamic_cast_base_recurse,
binfo_from_vbase, binfo_via_virtual, copied_binfo,
original_binfo): Likewise.
* cp/semantics.c (finish_base_specifier): Virtualness is indicated
by TREE_TYPE.
* cp/tree.c (copy_base_binfos): Use BINFO_VIRTUAL_P.
* java/java-tree.h (CLASS_HAS_SUPER_FLAG): Use BINFO_FLAG_1.
* java/class.c (add_interface_do): Use BINFO_VIRTUAL_P.
From-SVN: r84148
Diffstat (limited to 'gcc/cp/tree.c')
| -rw-r--r-- | gcc/cp/tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index c91164d..0863e29 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -612,7 +612,7 @@ copy_base_binfos (tree binfo, tree t, tree prev) BINFO_INHERITANCE_CHAIN (new_binfo) = binfo; BINFO_DEPENDENT_BASE_P (new_binfo) = 1; } - else if (TREE_VIA_VIRTUAL (base_binfo)) + else if (BINFO_VIRTUAL_P (base_binfo)) new_binfo = binfo_for_vbase (BINFO_TYPE (base_binfo), t); if (!new_binfo) @@ -621,10 +621,10 @@ copy_base_binfos (tree binfo, tree t, tree prev) base_binfo, NULL_TREE, BINFO_VIRTUALS (base_binfo)); prev = copy_base_binfos (new_binfo, t, prev); - if (TREE_VIA_VIRTUAL (base_binfo)) + if (BINFO_VIRTUAL_P (base_binfo)) { VEC_quick_push (tree, CLASSTYPE_VBASECLASSES (t), new_binfo); - TREE_VIA_VIRTUAL (new_binfo) = 1; + BINFO_VIRTUAL_P (new_binfo) = 1; BINFO_INHERITANCE_CHAIN (new_binfo) = TYPE_BINFO (t); } else |