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

pt.c (convert_nontype_argument): Only integral arguments get early folding.

Browse Source 
* pt.c (convert_nontype_argument): Only integral arguments
	get early folding.

From-SVN: r181219
This commit is contained in:
Jason Merrill 2011-11-09 12:53:12 -05:00 committed by Jason Merrill
parent 78d16361e1
commit ecf658592b
2 changed files with 21 additions and 4 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 @@
2011-11-09 Jason Merrill <jason@redhat.com>
* pt.c (convert_nontype_argument): Only integral arguments
get early folding.
* parser.c (cp_parser_alias_declaration): Don't do semantic
processing if parsing failed.

22
gcc/cp/pt.c
View File

@ -5681,10 +5681,24 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
&& (TYPE_PTR_P (type) || TYPE_PTR_TO_MEMBER_P (type)))
expr = convert (type, expr);
/* In C++11, non-type template arguments can be arbitrary constant
expressions. But don't fold a PTRMEM_CST to a CONSTRUCTOR yet. */
if (cxx_dialect >= cxx0x && TREE_CODE (expr) != PTRMEM_CST)
expr = maybe_constant_value (expr);
/* In C++11, integral or enumeration non-type template arguments can be
arbitrary constant expressions. Pointer and pointer to
member arguments can be general constant expressions that evaluate
to a null value, but otherwise still need to be of a specific form. */
if (cxx_dialect >= cxx0x)
{
if (INTEGRAL_OR_ENUMERATION_TYPE_P (type))
expr = maybe_constant_value (expr);
else if (TYPE_PTR_P (type)
|| (TYPE_PTR_TO_MEMBER_P (type)
&& TREE_CODE (expr) != PTRMEM_CST))
{
tree folded = maybe_constant_value (expr);
if (TYPE_PTR_P (type) ? integer_zerop (folded)
: null_member_pointer_value_p (folded))
expr = folded;
}
}
/* HACK: Due to double coercion, we can get a
NOP_EXPR<REFERENCE_TYPE>(ADDR_EXPR<POINTER_TYPE> (arg)) here,