aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2018-12-06 19:43:17 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2018-12-06 19:43:17 +0000
commit89a249f2ecbdfe856dab2cd82f913a93c88ecbfe (patch)
treeca1408b1ce5eff06b5c7a39d285c806516833e53 /gcc/cp
parentc438ab79bf28a354599dc6c460b2b662f555175b (diff)
downloadgcc-89a249f2ecbdfe856dab2cd82f913a93c88ecbfe.zip
gcc-89a249f2ecbdfe856dab2cd82f913a93c88ecbfe.tar.gz
gcc-89a249f2ecbdfe856dab2cd82f913a93c88ecbfe.tar.bz2
PR c++/88373 - wrong parse error with ~.
* parser.c (cp_parser_template_name): Check tag_type for none_type. * g++.dg/cpp2a/fn-template19.C: New test. From-SVN: r266865
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 89f2d88..1a3e73e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-06 Marek Polacek <polacek@redhat.com>
+
+ PR c++/88373 - wrong parse error with ~.
+ * parser.c (cp_parser_template_name): Check tag_type for
+ none_type.
+
2018-12-06 Segher Boessenkool <segher@kernel.crashing.org>
* cp-tree.h (finish_asm_stmt): Update declaration.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ceae72a..adfe09e 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16579,7 +16579,8 @@ cp_parser_template_name (cp_parser* parser,
if (!found
&& (cxx_dialect > cxx17)
&& !scoped_p
- && cp_lexer_next_token_is (parser->lexer, CPP_LESS))
+ && cp_lexer_next_token_is (parser->lexer, CPP_LESS)
+ && tag_type == none_type)
{
/* [temp.names] says "A name is also considered to refer to a template
if it is an unqualified-id followed by a < and name lookup finds