revert tests, will be changed later. One should still fail

Author: Aidan

clang/test/CXX/drs/cwg2xx.cpp

@@ -645,23 +645,23 @@ namespace cwg241 { // cwg241: 9
     // cxx98-17-error@-1 {{use of function template name with no prior declaration in function call with explicit template arguments is a C++20 extension}}
     A::f<3>(b);
     // expected-error@-1 {{no matching function for call to 'f'}}
-    //   expected-note@#cwg241-A-f {{candidate function template not viable: requires 0 arguments, but 1 was provided}}
+    // expected-note@#cwg241-A-f {{candidate function template not viable: requires 0 arguments, but 1 was provided}}
     A::g<3>(b);
     C::f<3>(b);
     // expected-error@-1 {{no matching function for call to 'f'}}
-    //   expected-note@#cwg241-C-f {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-    //   expected-note@#cwg241-C-f {{expected a type, but got value '3'}}
+    // expected-note@#cwg241-C-f 2{{template parameter is declared here}}
+    // expected-note@#cwg241-C-f 2{{candidate template ignored: invalid explicitly-specified argument: expected a type, but got value '3}}
+
     C::g<3>(b);
     // expected-error@-1 {{no matching function for call to 'g'}}
-    //   expected-note@#cwg241-C-g {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-    //   expected-note@#cwg241-C-g {{expected a type, but got value '3'}}
+    // expected-note@#cwg241-C-g {{template parameter is declared here}}
+    // expected-note@#cwg241-C-g {{candidate template ignored: invalid explicitly-specified argument: expected a type, but got value '3}}
+
     using C::f;
     using C::g;
     f<3>(b);
     // expected-error@-1 {{no matching function for call to 'f'}}
-    //   expected-note@#cwg241-C-f {{andidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-    //   expected-note@#cwg241-C-f {{expected a type, but got value '3'}}
-    //   expected-note@#cwg241-A-f {{candidate function template not viable: requires 0 arguments, but 1 was provided}}
+    // expected-note@#cwg241-A-f {{candidate function template not viable: requires 0 arguments, but 1 was provided}}
     g<3>(b);
   }
 } // namespace cwg241
@@ -954,7 +954,8 @@ namespace cwg258 { // cwg258: 2.8
   int &w = b.f(0);
   int &x = b.g<int>(0);
   // expected-error@-1 {{no matching member function for call to 'g'}}
-  //   expected-note@#cwg258-B-g {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
+  // expected-note@#cwg258-B-g {{template parameter is declared here}}
+  // expected-note@#cwg258-B-g {{candidate template ignored: invalid explicitly-specified argument: expected constant of type 'int' but got type 'int'}}
   int &y = b.h();
   float &z = const_cast<const B&>(b).h();
 

clang/test/CXX/drs/cwg3xx.cpp

@@ -981,8 +981,10 @@ namespace cwg354 { // cwg354: 3.1 c++11
   int b0 = both<0>();
   int b1 = both<(int*)0>();
   // cxx98-error@-1 {{no matching function for call to 'both'}}
-  //   cxx98-note@#cwg354-both-int-ptr {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-  //   cxx98-note@#cwg354-both-int {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
+  // cxx98-note@#cwg354-both-int-ptr {{template parameter is declared here}}
+  // cxx98-note@#cwg354-both-int-ptr {{candidate template ignored: invalid explicitly-specified argument: could not convert '(int *)0' from 'int *' to 'int'}}
+  // cxx98-note@#cwg354-both-int {{template parameter is declared here}}
+  // cxx98-note@#cwg354-both-int {{candidate template ignored: invalid explicitly-specified argument: could not convert '(int *)0' from 'int *' to 'int'}}
 
   template<int S::*> struct ptr_mem {}; // #cwg354-ptr_mem
   ptr_mem<0> m0; // #cwg354-m0

clang/test/CXX/expr/expr.const/p3-0x.cpp

@@ -106,8 +106,8 @@ void c() {
   }
 }
 template <bool B> int f() { return B; } // #f-bool-int
-// expected-note@#f-bool-int {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-// expected-note@#f-bool-int {{could not convert '&S::operator int' from 'int (S::*)() const' to 'bool'}}
+// expected-note@#f-bool-int {{template parameter is declared here}}
+// expected-note@#f-bool-int {{candidate template ignored: invalid explicitly-specified argument: could not convert '&S::operator int' from 'int (S::*)() const' to 'bool'}}
 template int f<&S::operator int>(); // expected-error {{does not refer to a function template}}
 template int f<(bool)&S::operator int>();
 

clang/test/CXX/temp/temp.res/temp.local/p1.cpp

@@ -10,9 +10,9 @@ template<typename> char id;
 template<typename> struct TempType {};
 template<template<typename> class> struct TempTemp {};
 
-template<typename> void use(int&); // expected-note {{invalid explicitly-specified argument}} expected-note {{no known conversion}}
+template<typename> void use(int&); // expected-note{{template parameter is declared here}} // expected-note {{invalid explicitly-specified argument}} expected-note {{no known conversion}}
 template<template<typename> class> void use(float&); // expected-note 2{{no known conversion}}
-template<int> void use(char&); // expected-note 2{{invalid explicitly-specified argument}}
+template<int> void use(char&); // expected-note 2{{template parameter is declared here}} // expected-note 2{{invalid explicitly-specified argument}}
 
 template<typename T> struct A {
   template<typename> struct C {};

clang/test/Modules/cxx-templates.cpp

@@ -42,10 +42,12 @@ void g() {
   template_param_kinds_1<int>(); // ok, from cxx-templates-b.h
 
   template_param_kinds_2<Tmpl_T_C>(); // expected-error {{no matching function}}
+  // expected-note@Inputs/cxx-templates-a.h:11 {{template parameter is declared here}}
   // expected-note@Inputs/cxx-templates-a.h:11 {{invalid explicitly-specified argument}}
   // expected-note@Inputs/cxx-templates-b.h:11 {{invalid explicitly-specified argument}}
 
   template_param_kinds_2<Tmpl_T_I_I>(); // expected-error {{ambiguous}}
+  // expected-note@Inputs/cxx-templates-b.h:11 {{template parameter is declared here}}
   // expected-note@Inputs/cxx-templates-a.h:11 {{candidate}}
   // expected-note@Inputs/cxx-templates-b.h:11 {{candidate}}
 

clang/test/SemaTemplate/overload-candidates.cpp

@@ -16,12 +16,11 @@ void test_dyn_cast(int* ptr) {
   (void)dyn_cast(ptr); // expected-error{{no matching function for call to 'dyn_cast'}}
 }
 
-template<int I, typename T> 
+template<int I, typename T> // expected-note {{template parameter is declared here}}
   void get(const T&); // #get-int-typename
-  // expected-note@#get-int-typename {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
-  // expected-note@#get-int-typename {{expected constant of type 'int' but got type 'int'}}
-template<template<class T> class, typename T> 
-  void get(const T&); // expected-note{{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
+  // expected-note@#get-int-typename {{candidate template ignored: invalid explicitly-specified argument: expected constant of type 'int' but got type 'int'}}
+template<template<class T> class, typename T> // expected-note {{template parameter is declared here}}
+  void get(const T&); // expected-note {{candidate template ignored: invalid explicitly-specified argument for 1st template parameter}}
 
 void test_get(void *ptr) {
   get<int>(ptr); // expected-error{{no matching function for call to 'get'}}

clang/test/SemaTemplate/temp_arg_nontype_cxx11.cpp

@@ -43,8 +43,8 @@ void TempFunc() {}
 
 void Useage() {
   //expected-error@+3 {{no matching function}}
-  //expected-note@-4 {{candidate template ignored: invalid explicitly-specified argument for 2nd template parameter}}
-  //expected-note@-5 {{could not convert '-1' from 'int' to 'unsigned int'}}
+  //expected-note@-5 {{template parameter is declared here}}
+  //expected-note@-5 {{candidate template ignored: invalid explicitly-specified argument: could not convert '-1' from 'int' to 'unsigned int'}}
   TempFunc<1, -1, 1>();
 }
 }