Commit 55b467a0 by Jason Merrill Committed by Jason Merrill

* parser.c (cp_parser_template_id): SET_EXPR_LOCATION.

From-SVN: r225691
parent b3ba1c09
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.
......
...@@ -13839,6 +13839,8 @@ cp_parser_template_id (cp_parser *parser, ...@@ -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, ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment