diff options
Diffstat (limited to 'gcc/cp/repo.c')
| -rw-r--r-- | gcc/cp/repo.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c index 8feab839038..7d93e4b8f0c 100644 --- a/gcc/cp/repo.c +++ b/gcc/cp/repo.c @@ -1,5 +1,5 @@ /* Code to maintain a C++ template repository. - Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Jason Merrill (jason@cygnus.com) This file is part of GNU CC. @@ -107,25 +107,6 @@ repo_get_id (t) vtable = get_vtbl_decl_for_binfo (TYPE_BINFO (t)); - /* If we don't have a primary vtable, try looking for a secondary - vtable. */ - if (vtable == NULL_TREE && !flag_new_abi - && TYPE_USES_VIRTUAL_BASECLASSES (t)) - { - tree binfos = BINFO_BASETYPES (TYPE_BINFO (t)); - int i, n_baselinks = binfos ? TREE_VEC_LENGTH (binfos) : 0; - for (i = 0; i < n_baselinks; ++i) - { - tree base_binfo = TREE_VEC_ELT (binfos, i); - if (TREE_VIA_VIRTUAL (base_binfo)) - { - vtable = get_vtbl_decl_for_binfo (base_binfo); - if (vtable) - break; - } - } - } - t = vtable; if (t == NULL_TREE) return t; @@ -157,7 +138,13 @@ repo_template_used (t) else if (DECL_P (t)) { if (IDENTIFIER_REPO_CHOSEN (id)) - mark_decl_instantiated (t, 0); + /* It doesn't make sense to instantiate a clone, so we + instantiate the cloned function instead. Note that this + approach will not work correctly if collect2 assigns + different clones to different files -- but it shouldn't. */ + mark_decl_instantiated (DECL_CLONED_FUNCTION_P (t) + ? DECL_CLONED_FUNCTION (t) : t, + 0); } else my_friendly_abort (1); |