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  <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
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),