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

pt.c (instantiation_dependent_r): Call value_dependent_expression_p. 

* pt.c (instantiation_dependent_r) [TRAIT_EXPR]: Call
	value_dependent_expression_p.

From-SVN: r225622
This commit is contained in:
Jason Merrill 2015-07-09 13:50:16 -04:00 committed by Jason Merrill
parent 5c4e8e5cd4
commit 1bf3fe3c6a
3 changed files with 6 additions and 5 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 @@
2015-07-09 Jason Merrill <jason@redhat.com>
* pt.c (instantiation_dependent_r) [TRAIT_EXPR]: Call
value_dependent_expression_p.
* cp-tree.h (struct cp_parameter_declarator): Rename ellipsis_p to
template_parameter_pack_p.
* parser.c (declarator_can_be_parameter_pack): False if

2
gcc/cp/parser.c
View File

@ -20788,7 +20788,7 @@ cp_parser_member_declaration (cp_parser* parser)
decl = cp_parser_alias_declaration (parser);
/* Note that if we actually see the '=' token after the
identifier, cp_parser_alias_declaration commits the
tentative parse. In that case, we really expects an
tentative parse. In that case, we really expect an
alias-declaration. Otherwise, we expect a using
declaration. */
alias_decl_expected =

6
gcc/cp/pt.c
View File

@ -20131,7 +20131,7 @@ template_for_substitution (tree decl)
}
/* Returns true if we need to instantiate this template instance even if we
know we aren't going to emit it.. */
know we aren't going to emit it. */
bool
always_instantiate_p (tree decl)
@ -21684,9 +21684,7 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees,
}
case TRAIT_EXPR:
if (dependent_type_p (TRAIT_EXPR_TYPE1 (*tp))
|| (TRAIT_EXPR_TYPE2 (*tp)
&& dependent_type_p (TRAIT_EXPR_TYPE2 (*tp))))
if (value_dependent_expression_p (*tp))
return *tp;
*walk_subtrees = false;
return NULL_TREE;