diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-06-20 16:13:33 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-06-20 16:13:33 +0000 |
| commit | 0f1e25b0d72e2ed1acda264536f5fa35df873bd2 (patch) | |
| tree | a8088da6ac4e468c49239cf037522fcfc34891e3 | |
| parent | 21b9069137d3a26069aa7fef10aedb94bfc3c657 (diff) | |
| download | gcc-0f1e25b0d72e2ed1acda264536f5fa35df873bd2.zip gcc-0f1e25b0d72e2ed1acda264536f5fa35df873bd2.tar.gz gcc-0f1e25b0d72e2ed1acda264536f5fa35df873bd2.tar.bz2 | |
* rtti.c (get_base_offset): Cope when vbase field is in a base.
From-SVN: r34619
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b416741..3be1d2a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2000-06-20 Nathan Sidwell <nathan@codesourcery.com> + * rtti.c (get_base_offset): Cope when vbase field is in a base. + +2000-06-20 Nathan Sidwell <nathan@codesourcery.com> + * call.c (build_conditional_expr): Use VOID_TYPE_P. * cvt.c (cp_convert_to_pointer): Likewise. (convert_to_void): Likewise. diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 8bf17d9..98a4582 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -549,10 +549,25 @@ get_base_offset (binfo, parent) else if (! vbase_offsets_in_vtable_p ()) { const char *name; + tree result; + tree field; FORMAT_VBASE_NAME (name, BINFO_TYPE (binfo)); - return byte_position (lookup_field (parent, get_identifier (name), - 0, 0)); + field = lookup_field (parent, get_identifier (name), 0, 0); + result = byte_position (field); + + if (DECL_CONTEXT (field) != parent) + { + /* The vbase pointer might be in a non-virtual base of PARENT. + * Adjust for the offset of that base in PARENT. */ + tree path; + + get_base_distance (DECL_CONTEXT (field), parent, -1, &path); + result = build (PLUS_EXPR, TREE_TYPE (result), + result, BINFO_OFFSET (path)); + result = fold (result); + } + return result; } else /* Under the new ABI, we store the vtable offset at which |