diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-04 07:11:05 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-04 07:11:05 +0000 |
| commit | 1f3233d13f58417984cb2239d328b65e8d172744 (patch) | |
| tree | 720630adca0f6b357e05c4feb8cbe33d556925ce /gcc/cp/class.c | |
| parent | 0dc11899d8781bca1da5f4421327d61890424808 (diff) | |
| download | gcc-1f3233d13f58417984cb2239d328b65e8d172744.tar.gz | |
Merge from pch-branch up to tag pch-commit-20020603.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54232 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 64b528a5a67..72f9faa0560 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2157,6 +2157,7 @@ duplicate_tag_error (t) memset ((char *) TYPE_LANG_SPECIFIC (t), 0, sizeof (struct lang_type)); BINFO_BASETYPES(binfo) = NULL_TREE; + TYPE_LANG_SPECIFIC (t)->u.h.is_lang_type_class = 1; TYPE_BINFO (t) = binfo; CLASSTYPE_INTERFACE_ONLY (t) = interface_only; SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, interface_unknown); @@ -4379,7 +4380,7 @@ check_bases_and_members (t, empty_p) /* Figure out whether or not we will need a cookie when dynamically allocating an array of this type. */ - TYPE_LANG_SPECIFIC (t)->vec_new_uses_cookie + TYPE_LANG_SPECIFIC (t)->u.c.vec_new_uses_cookie = type_requires_array_cookie (t); } @@ -5470,7 +5471,6 @@ init_class_processing () = (class_stack_node_t) xmalloc (current_class_stack_size * sizeof (struct class_stack_node)); VARRAY_TREE_INIT (local_classes, 8, "local_classes"); - ggc_add_tree_varray_root (&local_classes, 1); access_default_node = build_int_2 (0, 0); access_public_node = build_int_2 (ak_public, 0); @@ -7511,8 +7511,6 @@ build_vtbl_initializer (binfo, orig_binfo, t, rtti_binfo, non_fn_entries_p) VARRAY_TREE_INIT (vid.fns, 32, "fns"); /* Add the vcall and vbase offset entries. */ build_vcall_and_vbase_vtbl_entries (binfo, &vid); - /* Clean up. */ - VARRAY_FREE (vid.fns); /* Clear BINFO_VTABLE_PATH_MARKED; it's set by build_vbase_offset_vtbl_entries. */ for (vbase = CLASSTYPE_VBASECLASSES (t); |