aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/class.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2012-07-17 14:09:10 -0400
committerJason Merrill <jason@gcc.gnu.org>2012-07-17 14:09:10 -0400
commit947296ca906e03d78715ac7ed64cf21cea553c6c (patch)
treeea5e9a29a4648072055624e6c1d7e0a183a13051 /gcc/cp/class.c
parentec44e46396e6bc7f393ceb10d84df22b9b45f820 (diff)
downloadgcc-947296ca906e03d78715ac7ed64cf21cea553c6c.zip
gcc-947296ca906e03d78715ac7ed64cf21cea553c6c.tar.gz
gcc-947296ca906e03d78715ac7ed64cf21cea553c6c.tar.bz2
decl.c (xref_basetypes): Complain about incomplete template base.
* decl.c (xref_basetypes): Complain about incomplete template base. * class.c (finish_struct): Adjust variants in templates, too. From-SVN: r189583
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r--gcc/cp/class.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 3877a27..82c28fa 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6325,6 +6325,15 @@ finish_struct (tree t, tree attributes)
/* Remember current #pragma pack value. */
TYPE_PRECISION (t) = maximum_field_alignment;
+
+ /* Fix up any variants we've already built. */
+ for (x = TYPE_NEXT_VARIANT (t); x; x = TYPE_NEXT_VARIANT (x))
+ {
+ TYPE_SIZE (x) = TYPE_SIZE (t);
+ TYPE_SIZE_UNIT (x) = TYPE_SIZE_UNIT (t);
+ TYPE_FIELDS (x) = TYPE_FIELDS (t);
+ TYPE_METHODS (x) = TYPE_METHODS (t);
+ }
}
else
finish_struct_1 (t);