From 1c4d223d37d067f5d372688c0c0cc5a05d977df7 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Tue, 4 Aug 2020 09:35:25 -0400
Subject: [PATCH] c++: Template keyword following :: [PR96082]

In r9-4235 I tried to make sure that the template keyword follows
a nested-name-specifier.  :: is a valid nested-name-specifier, so
I also have to check 'globalscope' before giving the error.

gcc/cp/ChangeLog:

	PR c++/96082
	* parser.c (cp_parser_elaborated_type_specifier): Allow
	'template' following ::.

gcc/testsuite/ChangeLog:

	PR c++/96082
	* g++.dg/template/template-keyword3.C: New test.

(cherry picked from commit 97def1f34c134d78d4423e9ac3e9b262417ea390)
---
 gcc/cp/parser.c                                   |  2 +-
 gcc/testsuite/g++.dg/template/template-keyword3.C | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/template-keyword3.C

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ff0b2ed1ff0f..5de13d0498fa 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -18745,7 +18745,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
       if (!template_p)
 	cp_parser_parse_tentatively (parser);
       /* The `template' keyword must follow a nested-name-specifier.  */
-      else if (!nested_name_specifier)
+      else if (!nested_name_specifier && !globalscope)
 	{
 	  cp_parser_error (parser, "%<template%> must follow a nested-"
 			   "name-specifier");
diff --git a/gcc/testsuite/g++.dg/template/template-keyword3.C b/gcc/testsuite/g++.dg/template/template-keyword3.C
new file mode 100644
index 000000000000..91af2b3dc021
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/template-keyword3.C
@@ -0,0 +1,11 @@
+// PR c++/96082
+// { dg-do compile { target c++11 } }
+
+template <class> class A {};
+
+void
+f ()
+{ 
+  typename::template A <int> a;
+  ::template A <int> a2;
+}
-- 
2.47.3