diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58ee77c9042..907b82ca77a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,7 @@
 	* gxxint.texi: Remove obsolete documentation of overloading code.
 
 	* decl.c (finish_enum): Also set TYPE_SIZE_UNIT.
+	* class.c (finish_struct_bits): Likewise.
 
 	* tree.c (lvalue_type): Fix for arrays.
 	* typeck.c (build_unary_op): Use lvalue_type.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b62e8343bcb..afe430e0e61 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1848,6 +1848,7 @@ finish_struct_bits (t, max_has_virtual)
       TYPE_MAX_VALUE (variants) = TYPE_MAX_VALUE (t);
       TYPE_FIELDS (variants) = TYPE_FIELDS (t);
       TYPE_SIZE (variants) = TYPE_SIZE (t);
+      TYPE_SIZE_UNIT (variants) = TYPE_SIZE_UNIT (t);
       variants = TYPE_NEXT_VARIANT (variants);
     }