From 6bc39009e177dcd5fa77c995d7a5f7f3d8f8016d Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 15 May 1998 20:03:17 +0000 Subject: [PATCH] * class.c (finish_struct_1): Use BINFO_SIZE. From-SVN: r19782 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/class.c | 3 +++ 2 files changed, 5 insertions(+) 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 + * class.c (finish_struct_1): Use BINFO_SIZE. + * decl.c (start_decl): Use 'tem'. Thu May 14 16:30:47 EDT 1998 Andrew MacLeod 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); -- 2.30.2