[FOLD]

Author: sdkrystian

clang/docs/ReleaseNotes.rst

@@ -201,6 +201,8 @@ Improvements to Clang's diagnostics
 - Added diagnostics for C11 keywords being incompatible with language standards
   before C11, under a new warning group: ``-Wpre-c11-compat``.
 
+- Clang now diagnoses extraneous template parameter lists as a language extension.
+
 Improvements to Clang's time-trace
 ----------------------------------
 

clang/test/CXX/temp/temp.spec/temp.expl.spec/p16.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -pedantic-errors -verify %s
 template<class T> struct A { 
   void f(T);
   template<class X1> void g1(T, X1); 
@@ -36,3 +36,81 @@ namespace PR10024 {
   template <>
   void Test<T>::get<double>(double i) {}  // expected-error{{cannot specialize (with 'template<>') a member of an unspecialized template}}
 }
+
+namespace extraneous {
+  template<typename T> struct A;
+  template<typename T> int x;
+  template<typename T> void f();
+
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  struct A<int>;
+
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  int x<int>;
+
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  void f<int>();
+
+  template<typename T>
+  struct B {
+    struct C;
+
+    template<typename U>
+    struct D;
+
+    static int y;
+
+    template<typename U>
+    static int z;
+
+    void g();
+
+    template<typename U>
+    void h();
+  };
+
+  template<>
+  template<> // expected-error{{extraneous 'template<>' in declaration of struct 'C'}}
+  struct B<int>::C;
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  struct B<int>::D<int>;
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<typename U>
+  struct B<int>::D;
+
+  template<>
+  template<> // expected-error{{extraneous 'template<>' in declaration of variable 'y'}}
+  int B<int>::y;
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  int B<int>::z<int>;
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<typename U>
+  int B<int>::z;
+
+  template<>
+  template<>
+  void B<int>::g(); // expected-error{{no function template matches function template specialization 'g'}}
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<>
+  void B<int>::h<int>();
+
+  template<>
+  template<> // expected-error{{extraneous template parameter list in template specialization}}
+  template<typename U>
+  void B<int>::h<int>(); // expected-error{{function template partial specialization is not allowed}}
+}