git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parser.c (cp_parser_template_id): SET_EXPR_LOCATION. 

From-SVN: r225691
This commit is contained in:
Jason Merrill 2015-07-10 17:34:59 -04:00 committed by Jason Merrill
parent b3ba1c09a8
commit 55b467a057
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2015-07-10 Jason Merrill <jason@redhat.com>
* parser.c (cp_parser_template_id): SET_EXPR_LOCATION.
2015-07-10 Eric Botcazou <ebotcazou@adacore.com> 2015-07-10 Eric Botcazou <ebotcazou@adacore.com>
* decl2.c (cpp_check): Revert latest change. * decl2.c (cpp_check): Revert latest change.

4
gcc/cp/parser.c
View File

@ -13839,6 +13839,8 @@ cp_parser_template_id (cp_parser *parser,
else if (variable_template_p (templ)) else if (variable_template_p (templ))
{ {
template_id = lookup_template_variable (templ, arguments); template_id = lookup_template_variable (templ, arguments);
if (TREE_CODE (template_id) == TEMPLATE_ID_EXPR)
SET_EXPR_LOCATION (template_id, next_token->location);
} }
else else
{ {
@ -13849,6 +13851,8 @@ cp_parser_template_id (cp_parser *parser,
|| BASELINK_P (templ))); || BASELINK_P (templ)));
template_id = lookup_template_function (templ, arguments); template_id = lookup_template_function (templ, arguments);
if (TREE_CODE (template_id) == TEMPLATE_ID_EXPR)
SET_EXPR_LOCATION (template_id, next_token->location);
} }
/* If parsing tentatively, replace the sequence of tokens that makes /* If parsing tentatively, replace the sequence of tokens that makes