From 21b3d0ba2b0f3871a2c889d91b187ae9ab13cca9 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Wed, 27 Nov 2002 20:44:16 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/class.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 42ae0dda194..677a6bb6ea4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-11-27 Mark Mitchell + + * class.c (build_base_field): Make sure we get the canonical base + when descending through primary bases. + 2002-11-26 Geoffrey Keating * decl.c (check_initializer): Don't error on initialisation of diff --git a/gcc/cp/class.c b/gcc/cp/class.c index fdd9c479a83..0d933346e6b 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -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),