diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-10-26 00:44:44 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-10-26 00:44:44 +0000 |
| commit | e93ee6440d040187605f3ff56cbf01dc169f7d5e (patch) | |
| tree | 4851d0f3f74a197c70c79513cd29892c5249e71a /gcc/cp/call.c | |
| parent | 0fb53e681df209314cd78a791423bfd8476b8c78 (diff) | |
| download | gcc-e93ee6440d040187605f3ff56cbf01dc169f7d5e.zip gcc-e93ee6440d040187605f3ff56cbf01dc169f7d5e.tar.gz gcc-e93ee6440d040187605f3ff56cbf01dc169f7d5e.tar.bz2 | |
call.c (build_over_call): Use DECL_CONTEXT, not DECL_VIRTUAL_CONTEXT.
* call.c (build_over_call): Use DECL_CONTEXT, not
DECL_VIRTUAL_CONTEXT.
* class.c (modify_vtable_entry): Don't mess with
DECL_VIRTUAL_CONTEXT.
(set_vindex): Remove.
(set_primary_base): Remove vfuns_p parameter.
(determine_primary_base): Likewise.
(modify_all_vtables): Likewise.
(layout_class_type): Likewise. Adjust calls to other functions
accordingly.
(finish_struct_1): Adjust calls to modified functions. Set
DECL_VINDEX here.
* cp-tree.h (lang_type_class): Remove vsize.
(CLASSTYPE_VSIZE): Remove.
(lang_decl): Remove thunks.
(DECL_THUNKS): Adjust.
(DECL_VIRTUAL_CONTEXT): Remove.
(duplicate_decls): Don't copy it.
* pt.c (build_template_decl): Don't set it.
(tsubst_decl): Likewise.
* typeck.c (expand_ptrmemfunc_cst): Don't use it.
* g++.dg/lookup/ptrmem1.C: New test.
From-SVN: r58548
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1b79ac4..4ec8d5e 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4507,7 +4507,7 @@ build_over_call (cand, args, flags) { tree t, *p = &TREE_VALUE (converted_args); tree binfo = lookup_base (TREE_TYPE (TREE_TYPE (*p)), - DECL_VIRTUAL_CONTEXT (fn), + DECL_CONTEXT (fn), ba_any, NULL); my_friendly_assert (binfo && binfo != error_mark_node, 20010730); |