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

re PR c++/56859 (alignas() fails in template)

Browse Source 
PR c++/56859
	* typeck.c (cxx_alignas_expr): Handle value-dependence properly.

From-SVN: r198310
This commit is contained in:
Jason Merrill 2013-04-25 12:24:42 -04:00 committed by Jason Merrill
parent 4794d4b5fe
commit 17365662e4
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2013-04-25 Jason Merrill <jason@redhat.com>
PR c++/56859
* typeck.c (cxx_alignas_expr): Handle value-dependence properly.
PR c++/50261
* init.c (perform_member_init): Call reshape_init.

21
gcc/cp/typeck.c
View File

@ -1725,15 +1725,19 @@ cxx_alignas_expr (tree e)
When the alignment-specifier is of the form
alignas(type-id ), it shall have the same effect as
alignas( alignof(type-id )). */
alignas(alignof(type-id )). */
return cxx_sizeof_or_alignof_type (e, ALIGNOF_EXPR, false);
/* If we reach this point, it means the alignas expression if of
the form "alignas(assignment-expression)", so we should follow
what is stated by [dcl.align]/2. */
if (value_dependent_expression_p (e))
/* Leave value-dependent expression alone for now. */
return e;
e = fold_non_dependent_expr (e);
e = mark_rvalue_use (e);
/* [dcl.align]/2 says:
@ -1741,18 +1745,7 @@ cxx_alignas_expr (tree e)
the assignment-expression shall be an integral constant
expression. */
e = fold_non_dependent_expr (e);
if (value_dependent_expression_p (e))
/* Leave value-dependent expression alone for now. */;
else
e = cxx_constant_value (e);
if (e == NULL_TREE
|| e == error_mark_node
|| TREE_CODE (e) != INTEGER_CST)
return error_mark_node;
return e;
return cxx_constant_value (e);
}

14
gcc/testsuite/g++.dg/cpp0x/gen-attrs-54.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/56859
// { dg-require-effective-target c++11 }
template<unsigned size, unsigned alignment>
struct aligned_storage
{
using type = struct { alignas(alignment) unsigned char data[size]; };
};
#define SA(X) static_assert((X),#X)
SA(alignof(aligned_storage<8,1>::type) == 1);
SA(alignof(aligned_storage<8,2>::type) == 2);
SA(alignof(aligned_storage<8,4>::type) == 4);
SA(alignof(aligned_storage<8,8>::type) == 8);