Merge commit '8658d1576548' from llvm.org/main into next

Author: git apple-llvm automerger

clang/docs/ReleaseNotes.rst

@@ -590,7 +590,6 @@ Improvements to Clang's diagnostics
 - Clang now diagnoses the requirement that non-template friend declarations with requires clauses
   and template friend declarations with a constraint that depends on a template parameter from an
   enclosing template must be a definition.
-- Clang now diagnoses function/variable templates that shadow their own template parameters, e.g. ``template<class T> void T();``.
 - Clang now diagnoses incorrect usage of ``const`` and ``pure`` attributes, so ``-Wignored-attributes`` diagnoses more cases.
 - Clang now emits more descriptive diagnostics for 'unusual' expressions (e.g. incomplete index
   expressions on matrix types or builtin functions without an argument list) as placement-args

clang/lib/Sema/SemaDecl.cpp

@@ -6380,6 +6380,12 @@ NamedDecl *Sema::HandleDeclarator(Scope *S, Declarator &D,
   } else if (DiagnoseUnexpandedParameterPack(NameInfo, UPPC_DeclarationType))
     return nullptr;
 
+  // The scope passed in may not be a decl scope.  Zip up the scope tree until
+  // we find one that is.
+  while ((S->getFlags() & Scope::DeclScope) == 0 ||
+         (S->getFlags() & Scope::TemplateParamScope) != 0)
+    S = S->getParent();
+
   DeclContext *DC = CurContext;
   if (D.getCXXScopeSpec().isInvalid())
     D.setInvalidType();
@@ -6532,12 +6538,6 @@ NamedDecl *Sema::HandleDeclarator(Scope *S, Declarator &D,
   if (getLangOpts().CPlusPlus)
     CheckExtraCXXDefaultArguments(D);
 
-  // The scope passed in may not be a decl scope.  Zip up the scope tree until
-  // we find one that is.
-  while ((S->getFlags() & Scope::DeclScope) == 0 ||
-         (S->getFlags() & Scope::TemplateParamScope) != 0)
-    S = S->getParent();
-
   NamedDecl *New;
 
   bool AddToScope = true;

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

@@ -127,30 +127,16 @@ template<int T> struct Z { // expected-note 16{{declared here}}
 template<typename T> // expected-note {{declared here}}
 void f(int T) {} // expected-error {{declaration of 'T' shadows template parameter}}
 
+// FIXME: These are ill-formed: a template-parameter shall not have the same name as the template name.
 namespace A {
   template<typename T> struct T {};  // expected-error{{declaration of 'T' shadows template parameter}}
                                      // expected-note@-1{{template parameter is declared here}}
-  template<typename T> struct U {
-    template<typename V> struct V {}; // expected-error{{declaration of 'V' shadows template parameter}}
-                                      // expected-note@-1{{template parameter is declared here}}
-  };
 }
 namespace B {
-  template<typename T> void T() {} // expected-error{{declaration of 'T' shadows template parameter}}
-                                   // expected-note@-1{{template parameter is declared here}}
-
-  template<typename T> struct U {
-    template<typename V> void V(); // expected-error{{declaration of 'V' shadows template parameter}}
-                                   // expected-note@-1{{template parameter is declared here}}
-  };
+  template<typename T> void T() {}
 }
 namespace C {
-  template<typename T> int T; // expected-error{{declaration of 'T' shadows template parameter}}
-                              // expected-note@-1{{template parameter is declared here}}
-  template<typename T> struct U {
-    template<typename V> static int V; // expected-error{{declaration of 'V' shadows template parameter}}
-                                       // expected-note@-1{{template parameter is declared here}}
-  };
+  template<typename T> int T;
 }
 
 namespace PR28023 {