From 2f3932b910c7e450e0ac75e607dfb7229b9429cc Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 21 Jan 2016 15:26:09 -0500 Subject: re PR c++/40751 (G++ never packs typedef'd enums) PR c++/40751 PR c++/64987 * decl.c (copy_type_enum): Respect TYPE_USER_ALIGN. From-SVN: r232702 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f516216..c592cbf 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2016-01-21 Jason Merrill + PR c++/40751 + PR c++/64987 + * decl.c (copy_type_enum): Respect TYPE_USER_ALIGN. + PR c++/43407 * decl.c (start_enum): Add attributes parameter. * parser.c (cp_parser_enum_specifier): Pass it. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d995654..020e9bd 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13030,8 +13030,12 @@ copy_type_enum (tree dst, tree src) TYPE_SIZE_UNIT (t) = TYPE_SIZE_UNIT (src); SET_TYPE_MODE (dst, TYPE_MODE (src)); TYPE_PRECISION (t) = TYPE_PRECISION (src); - TYPE_ALIGN (t) = TYPE_ALIGN (src); - TYPE_USER_ALIGN (t) = TYPE_USER_ALIGN (src); + unsigned valign = TYPE_ALIGN (src); + if (TYPE_USER_ALIGN (t)) + valign = MAX (valign, TYPE_ALIGN (t)); + else + TYPE_USER_ALIGN (t) = TYPE_USER_ALIGN (src); + TYPE_ALIGN (t) = valign; TYPE_UNSIGNED (t) = TYPE_UNSIGNED (src); } } -- cgit v1.1