OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/65734 (Yet another case of lost alignment by stor_layout)

Browse Source 
PR c++/65734
gcc/
	* stor-layout.c (layout_type): Layout the TYPE_MAIN_VARIANT.
	(finalize_type_size): Respect TYPE_USER_ALIGN.
	(layout_type) [ARRAY_TYPE]: Likewise.
gcc/cp/
	* class.c (fixup_attribute_variants): Respect TYPE_USER_ALIGN.

From-SVN: r222529
This commit is contained in:
Jason Merrill 2015-04-28 10:43:48 -04:00 committed by Jason Merrill
parent 544f7fc841
commit 7bfc5adac8
6 changed files with 77 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2015-04-28 Jason Merrill <jason@redhat.com>
PR c++/65734
* stor-layout.c (layout_type): Layout the TYPE_MAIN_VARIANT.
(finalize_type_size): Respect TYPE_USER_ALIGN.
(layout_type) [ARRAY_TYPE]: Likewise.
2015-04-28 Yvan Roux <yvan.roux@linaro.org>
* config/arm/arm.md (*arm_movt): Fix type attribute.

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-28 Jason Merrill <jason@redhat.com>
PR c++/65734
* class.c (fixup_attribute_variants): Respect TYPE_USER_ALIGN.
2015-04-27 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* class.c (layout_class_type): Remove check if

13
gcc/cp/class.c
View File

@ -1989,14 +1989,23 @@ fixup_attribute_variants (tree t)
if (!t)
return;
tree attrs = TYPE_ATTRIBUTES (t);
unsigned align = TYPE_ALIGN (t);
bool user_align = TYPE_USER_ALIGN (t);
for (variants = TYPE_NEXT_VARIANT (t);
variants;
variants = TYPE_NEXT_VARIANT (variants))
{
/* These are the two fields that check_qualified_type looks at and
are affected by attributes. */
TYPE_ATTRIBUTES (variants) = TYPE_ATTRIBUTES (t);
TYPE_ALIGN (variants) = TYPE_ALIGN (t);
TYPE_ATTRIBUTES (variants) = attrs;
unsigned valign = align;
if (TYPE_USER_ALIGN (variants))
valign = MAX (valign, TYPE_ALIGN (variants));
else
TYPE_USER_ALIGN (variants) = user_align;
TYPE_ALIGN (variants) = valign;
}
}

24
gcc/stor-layout.c
View File

@ -1826,9 +1826,13 @@ finalize_type_size (tree type)
{
TYPE_SIZE (variant) = size;
TYPE_SIZE_UNIT (variant) = size_unit;
TYPE_ALIGN (variant) = align;
unsigned valign = align;
if (TYPE_USER_ALIGN (variant))
valign = MAX (valign, TYPE_ALIGN (variant));
else
TYPE_USER_ALIGN (variant) = user_align;
TYPE_ALIGN (variant) = valign;
TYPE_PRECISION (variant) = precision;
TYPE_USER_ALIGN (variant) = user_align;
SET_TYPE_MODE (variant, mode);
}
}
@ -2149,6 +2153,10 @@ layout_type (tree type)
if (type == error_mark_node)
return;
/* We don't want finalize_type_size to copy an alignment attribute to
variants that don't have it. */
type = TYPE_MAIN_VARIANT (type);
/* Do nothing if type has been laid out before. */
if (TYPE_SIZE (type))
return;
@ -2345,13 +2353,17 @@ layout_type (tree type)
/* Now round the alignment and size,
using machine-dependent criteria if any. */
unsigned align = TYPE_ALIGN (element);
if (TYPE_USER_ALIGN (type))
align = MAX (align, TYPE_ALIGN (type));
else
TYPE_USER_ALIGN (type) = TYPE_USER_ALIGN (element);
#ifdef ROUND_TYPE_ALIGN
TYPE_ALIGN (type)
= ROUND_TYPE_ALIGN (type, TYPE_ALIGN (element), BITS_PER_UNIT);
align = ROUND_TYPE_ALIGN (type, align, BITS_PER_UNIT);
#else
TYPE_ALIGN (type) = MAX (TYPE_ALIGN (element), BITS_PER_UNIT);
align = MAX (align, BITS_PER_UNIT);
#endif
TYPE_USER_ALIGN (type) = TYPE_USER_ALIGN (element);
TYPE_ALIGN (type) = align;
SET_TYPE_MODE (type, BLKmode);
if (TYPE_SIZE (type) != 0
&& ! targetm.member_type_forces_blk (type, VOIDmode)

16
gcc/testsuite/g++.dg/cpp0x/alignas1.C Normal file
View File

@ -0,0 +1,16 @@
// PR c++/65734
// { dg-do compile { target c++11 } }
template <class T> struct A
{
T t;
};
typedef A<int> T[4] alignas (2 * alignof (int));
A<int> a[4];
typedef A<char> T2[4] alignas (2 * alignof (int));
#define SA(X) static_assert((X),#X)
SA(alignof (T) == 2 * alignof(int));
SA(alignof (T2) == 2 * alignof(int));

20
gcc/testsuite/g++.dg/cpp0x/alignas2.C Normal file
View File

@ -0,0 +1,20 @@
// PR c++/65734
// { dg-do compile { target c++11 } }
template <typename T>
struct BVector
{
T t;
};
BVector<int> m;
template <template <class> class T>
struct BV2
{
typedef T<float> value_type alignas (16);
value_type v;
};
BV2<BVector> m2;
#define SA(X) static_assert((X),#X)
SA(alignof (BV2<BVector>::value_type) == 16);