aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-01-26 10:40:42 -0500
committerJason Merrill <jason@redhat.com>2022-01-26 11:39:40 -0500
commit00d8321124123daf41f7c51526355a5a610cdeb8 (patch)
tree9f0e89b6661f1a045f06227d17bbbde07a4939c0 /gcc/cp
parent1bc00a489086b0bdde89ccb11dfa4f50b6c4e8f0 (diff)
downloadgcc-00d8321124123daf41f7c51526355a5a610cdeb8.zip
gcc-00d8321124123daf41f7c51526355a5a610cdeb8.tar.gz
gcc-00d8321124123daf41f7c51526355a5a610cdeb8.tar.bz2
c++: ->template and using-decl [PR104235]
cp_parser_template_id wasn't prepared to handle getting a USING_DECL back from cp_parser_template_name. Let's defer that case to instantiation time, as well. PR c++/104235 gcc/cp/ChangeLog: * parser.cc (cp_parser_template_name): Repeat lookup of USING_DECL. gcc/testsuite/ChangeLog: * g++.dg/parse/template-keyword2.C: New test.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/parser.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index ed219d7..8b38165 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -18680,7 +18680,8 @@ cp_parser_template_name (cp_parser* parser,
cp_parser_error (parser, "expected template-name");
return error_mark_node;
}
- else if (!DECL_P (decl) && !is_overloaded_fn (decl))
+ else if ((!DECL_P (decl) && !is_overloaded_fn (decl))
+ || TREE_CODE (decl) == USING_DECL)
/* Repeat the lookup at instantiation time. */
decl = identifier;
}