From: Jason Merrill <jason@redhat.com>
Date: Fri, 30 Jun 2017 21:08:53 +0000 (-0400)
Subject: PR c++/81257 - ICE with invalid ::template.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d4de231f7215b4b890ccf89135772bd8f3a97db;p=gcc.git

PR c++/81257 - ICE with invalid ::template.

	PR c++/54769 - wrong lookup of dependent template-name.
	* parser.c (cp_parser_template_name): Revert part of last change.

From-SVN: r249855
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ff57214535f..eeeaeec5363 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-30  Jason Merrill  <jason@redhat.com>
+
+	PR c++/81257 - ICE with invalid ::template.
+	PR c++/54769 - wrong lookup of dependent template-name.
+	* parser.c (cp_parser_template_name): Revert part of last change.
+
 2017-06-30  Nathan Sidwell  <nathan@acm.org>
 
 	* config-lang.in (gtfiles): Add cp/lex.c.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ea5a5103565..a9623ae0841 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -15911,11 +15911,6 @@ cp_parser_template_name (cp_parser* parser,
 				/*ambiguous_decls=*/NULL,
 				token->location);
 
-  /* If the lookup failed and we got the 'template' keyword, believe it.  */
-  if (decl == error_mark_node && template_keyword_p
-      && processing_template_decl)
-    return identifier;
-
   decl = strip_using_decl (decl);
 
   /* If DECL is a template, then the name was a template-name.  */
diff --git a/gcc/testsuite/g++.dg/parse/template-keyword1.C b/gcc/testsuite/g++.dg/parse/template-keyword1.C
new file mode 100644
index 00000000000..0a1298e75f5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/template-keyword1.C
@@ -0,0 +1,3 @@
+// PR c++/81257
+
+template < typename ::template A < int > >; // { dg-error "" }