diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d8d4752f1b1..0ad5920b141 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 Fri May 15 00:46:05 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* class.c (finish_struct_1): Use BINFO_SIZE.
+
 	* decl.c (start_decl): Use 'tem'.
 
 Thu May 14 16:30:47 EDT 1998  Andrew MacLeod  <amacleod@cygnus.com>
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a07563febaf..99284d65525 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -3864,6 +3864,9 @@ finish_struct_1 (t, warn_anon)
      the virtual bases.  */
   if (empty && flag_new_abi)
     CLASSTYPE_SIZE (t) = integer_zero_node;
+  else if (flag_new_abi && TYPE_HAS_COMPLEX_INIT_REF (t)
+	   && TYPE_HAS_COMPLEX_ASSIGN_REF (t))
+    CLASSTYPE_SIZE (t) = TYPE_BINFO_SIZE (t);
   else
     CLASSTYPE_SIZE (t) = TYPE_SIZE (t);
   CLASSTYPE_ALIGN (t) = TYPE_ALIGN (t);