* parser.c (cp_parser_template_id): SET_EXPR_LOCATION.

From-SVN: r225691

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f61c89b9484d8d8d67d3a4ba71960df2102223f..cf9f838a1c19e79b6ea2c146779a51423eee636e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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>
 
        * decl2.c (cpp_check): Revert latest change.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b5f1af8b135204fbbd1e0796697b6f4c17e76037..6ae9556980026c6ef5d9abc9492b097cffb889b3 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -13839,6 +13839,8 @@ cp_parser_template_id (cp_parser *parser,
   else if (variable_template_p (templ))
     {
       template_id = lookup_template_variable (templ, arguments);
+      if (TREE_CODE (template_id) == TEMPLATE_ID_EXPR)
+       SET_EXPR_LOCATION (template_id, next_token->location);
     }
   else
     {
@@ -13849,6 +13851,8 @@ cp_parser_template_id (cp_parser *parser,
                   || BASELINK_P (templ)));
 
       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