class.c (build_base_field): Make sure we get the canonical base when descending through primary bases.

* class.c (build_base_field): Make sure we get the canonical base
	when descending through primary bases.

From-SVN: r59582
This commit is contained in:
Mark Mitchell 2002-11-27 20:44:16 +00:00 committed by Mark Mitchell
parent 249e6b636b
commit 21b3d0ba2b
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2002-11-27 Mark Mitchell <mark@codesourcery.com>
* class.c (build_base_field): Make sure we get the canonical base
when descending through primary bases.
2002-11-26 Geoffrey Keating <geoffk@apple.com>
* decl.c (check_initializer): Don't error on initialisation of

View file

@ -3863,7 +3863,10 @@ build_base_field (record_layout_info rli, tree binfo,
tree b;
b = get_primary_binfo (binfo);
if (!b || BINFO_PRIMARY_BASE_OF (b) != binfo)
if (!b)
break;
b = CANONICAL_BINFO (b, rli->t);
if (BINFO_PRIMARY_BASE_OF (b) != binfo)
break;
if (TREE_VIA_VIRTUAL (b))
record_subobject_offsets (BINFO_TYPE (b),