diff options
| author | oldham <oldham@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-14 21:36:20 +0000 |
|---|---|---|
| committer | oldham <oldham@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-14 21:36:20 +0000 |
| commit | 049d65c8e05325ef9e9abaec87a495b2d46c72c0 (patch) | |
| tree | 705346a28d62a633c3d46d47bac4a790d5c8f560 /gcc/cp/rtti.c | |
| parent | 3578dcd843cab3e2a58dc6bc13e96f048eedc08a (diff) | |
| download | gcc-049d65c8e05325ef9e9abaec87a495b2d46c72c0.tar.gz | |
2003-01-14 Jeffrey D. Oldham <oldham@codesourcery.com>
Further conform g++'s __vmi_class_type_info to the C++ ABI
specification.
* gcc/cp/rtti.c (dfs_class_hint_mark): Do not set hints not
specified by the specification.
(class_hint_flags): Likewise.
* gcc/testsuite/g++.old-deja/g++.abi/vmihint.C (main): Revise
expected flags per the specification.
* libstdc++-v3/libsupc++/cxxabi.h
(__vmi_class_type_info::__flags_masks): Remove enumerations not
required by the specification.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61304 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/rtti.c')
| -rw-r--r-- | gcc/cp/rtti.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 71b8e34b199..0b688051f9f 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -1,5 +1,5 @@ /* RunTime Type Identification - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Mostly written by Jason Merrill (jason@cygnus.com). @@ -916,8 +916,6 @@ dfs_class_hint_mark (tree binfo, void *data) *hint |= 1; SET_CLASSTYPE_MARKED (basetype); } - if (!TREE_VIA_PUBLIC (binfo) && TYPE_BINFO (basetype) != binfo) - *hint |= 4; return NULL_TREE; }; @@ -939,18 +937,10 @@ static int class_hint_flags (tree type) { int hint_flags = 0; - int i; dfs_walk (TYPE_BINFO (type), dfs_class_hint_mark, NULL, &hint_flags); dfs_walk (TYPE_BINFO (type), dfs_class_hint_unmark, NULL, NULL); - for (i = 0; i < CLASSTYPE_N_BASECLASSES (type); ++i) - { - tree base_binfo = BINFO_BASETYPE (TYPE_BINFO (type), i); - - if (TREE_VIA_PUBLIC (base_binfo)) - hint_flags |= 0x8; - } return hint_flags; } |