diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-05-21 17:01:22 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-05-21 17:01:22 +0000 |
| commit | cf2e003bf103122cf68236dca04f20c958f189ef (patch) | |
| tree | 6897a36d9ca4ed4a5e2599cf0ad643d75448e354 /gcc/cp/semantics.c | |
| parent | bf5df909a9bfd487f96a871f8997a696e3848043 (diff) | |
| download | gcc-cf2e003bf103122cf68236dca04f20c958f189ef.zip gcc-cf2e003bf103122cf68236dca04f20c958f189ef.tar.gz gcc-cf2e003bf103122cf68236dca04f20c958f189ef.tar.bz2 | |
cp-tree.h (struct lang_type): Remove search_slot.
* cp-tree.h (struct lang_type): Remove search_slot.
(CLASSTYPE_SEARCH_SLOT): Remove.
(emit_base_init): Change prototype.
(initialize_vtbl_ptrs): Likewise.
(expand_indirect_vtbls_init): Likewise.
(clear_search_slots): Remove.
* decl.c (lang_mark_tree): Don't mark search_slot.
* init.c (initialize_vtbl_ptrs): Simplify.
(emit_base_init): Likewise.
* search.c (struct vbase_info): Document decl_ptr.
(convert_pointer_to_single_level): Remove.
(dfs_find_vbases): Remove.
(dfs_init_base_pointers): Simplify.
(dfs_clear_vbase_slots): Remove.
(dfs_vtable_path_unmark): New function.
(init_vbase_pointers): Simplify.
(expand_upcast_fixups): Don't rely on CLASSTYPE_SEARCH_SLOT.
(expand_indirect_vtbls_init): Simplify. Don't call
mark_all_temps_used.
* semantics.c (setup_vtbl_ptr): Adjust calls to emit_base_init and
initialize_vtbl_ptrs.
From-SVN: r34067
Diffstat (limited to 'gcc/cp/semantics.c')
| -rw-r--r-- | gcc/cp/semantics.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index ca0704c..8f9a28b 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1247,7 +1247,7 @@ setup_vtbl_ptr () add_tree (ctor_stmt); /* And actually initialize the base-classes and members. */ - emit_base_init (current_class_type); + emit_base_init (); } } else if (DECL_DESTRUCTOR_P (current_function_decl) @@ -1286,8 +1286,7 @@ setup_vtbl_ptr () /* Make all virtual function table pointers in non-virtual base classes point to CURRENT_CLASS_TYPE's virtual function tables. */ - initialize_vtbl_ptrs (current_class_type, - current_class_ptr); + initialize_vtbl_ptrs (current_class_ptr); finish_compound_stmt (/*has_no_scope=*/0, compound_stmt); finish_then_clause (if_stmt); |