From 1ddd4323a4ef593ac653e8241cbc5fca0efc7f5e Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 3 Jul 2000 08:13:33 +0000 Subject: [PATCH] pt.c (instantiate_class_template): Set CLASSTYPE_VBASECLASSES. * pt.c (instantiate_class_template): Set CLASSTYPE_VBASECLASSES. * semantics.c (begin_class_definition): Clear it. From-SVN: r34842 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 2 ++ gcc/cp/semantics.c | 1 + 3 files changed, 8 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 96cd52a..3063e0f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2000-07-03 Nathan Sidwell + + * pt.c (instantiate_class_template): Set CLASSTYPE_VBASECLASSES. + * semantics.c (begin_class_definition): Clear it. + 2000-07-02 Benjamin Chelf * cp-tree.h (genrtl_goto_stmt): Remove declaration. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0eec453..50fdbf0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4841,6 +4841,8 @@ instantiate_class_template (type) TYPE_FIELDS (type) = TYPE_FIELDS (pattern); TYPE_METHODS (type) = TYPE_METHODS (pattern); CLASSTYPE_TAGS (type) = CLASSTYPE_TAGS (pattern); + CLASSTYPE_VBASECLASSES (type) = CLASSTYPE_VBASECLASSES (pattern); + /* Pretend that the type is complete, so that we will look inside it during name lookup and such. */ TYPE_SIZE (type) = bitsize_zero_node; diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 485cc59..1aeb545 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1886,6 +1886,7 @@ begin_class_definition (t) TYPE_FIELDS (t) = NULL_TREE; TYPE_METHODS (t) = NULL_TREE; CLASSTYPE_TAGS (t) = NULL_TREE; + CLASSTYPE_VBASECLASSES (t) = NULL_TREE; TYPE_SIZE (t) = NULL_TREE; } -- 2.7.4