From bd7eccc44ea8e4e2947f629654c474d399bcca30 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 16 Jul 2004 08:07:08 +0000 Subject: [PATCH] * pt.c (tsubst) : We should never get here. From-SVN: r84810 --- gcc/cp/ChangeLog | 10 +++++++--- gcc/cp/pt.c | 21 ++------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6a3bb289e70..a2c540fbc09 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-07-16 Nathan Sidwell + + * pt.c (tsubst) : We should never get here. + 2004-07-15 Mark Mitchell * cp-tree.h (lang_type_class): Remove has_real_assign_ref and @@ -432,10 +436,10 @@ push_base_cleanups): Likewise. * method.c (do_build_copy_constructor, do_build_assign_reg, synthesize_exception_spec): Likewise. - * name-lookup.c (arg_assoc_class): + * name-lookup.c (arg_assoc_class): Likewise. * pt.c (instantiate_class_template, tsubst, - get_template_base_recursive): - * ptree.c (cxx_print_type): + get_template_base_recursive): Likewise. + * ptree.c (cxx_print_type): Likewise. * rtti.c (get_psuedo_ti_init, get_pseudo_ti_desc): Likewise. * search.c (lookup_base_r, dynamic_cast_base_recurse, dfs_access_in_type, access_in_type, lookup_field_queue_p, diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4a429d6140b..3d61c98a5e9 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6890,25 +6890,8 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) } case TREE_BINFO: - /* A binfo node. We always need to make a copy, of the node - itself and of its BINFO_BASE_BINFOS. */ - my_friendly_assert (type, 20040628); - - t = copy_node (t); - - /* Make sure type isn't a typedef copy. */ - type = BINFO_TYPE (TYPE_BINFO (type)); - - TREE_TYPE (t) = complete_type (type); - if (IS_AGGR_TYPE (type)) - { - BINFO_VTABLE (t) = BINFO_VTABLE (TYPE_BINFO (type)); - BINFO_VIRTUALS (t) = BINFO_VIRTUALS (TYPE_BINFO (type)); - if (BINFO_BASE_BINFOS (TYPE_BINFO (type)) != NULL_TREE) - BINFO_BASE_BINFOS (t) - = copy_node (BINFO_BASE_BINFOS (TYPE_BINFO (type))); - } - return t; + /* We should never be tsubsting a binfo. */ + abort (); case TREE_VEC: /* A vector of template arguments. */ -- 2.30.2