checkProtocolSelfRequirements can be static

Author: hamishknight

lib/Sema/TypeCheckDecl.cpp

@@ -2580,7 +2580,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     if (!SD->isInvalid()) {
       TC.checkReferencedGenericParams(SD);
       checkGenericParams(SD->getGenericParams(), SD);
-      TC.checkProtocolSelfRequirements(SD);
+      TypeChecker::checkProtocolSelfRequirements(SD);
     }
 
     TypeChecker::checkDeclAttributes(SD);
@@ -3188,7 +3188,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     if (!FD->isInvalid()) {
       checkGenericParams(FD->getGenericParams(), FD);
       TC.checkReferencedGenericParams(FD);
-      TC.checkProtocolSelfRequirements(FD);
+      TypeChecker::checkProtocolSelfRequirements(FD);
     }
 
     checkAccessControl(TC, FD);
@@ -3429,7 +3429,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     if (!CD->isInvalid()) {
       checkGenericParams(CD->getGenericParams(), CD);
       TC.checkReferencedGenericParams(CD);
-      TC.checkProtocolSelfRequirements(CD);
+      TypeChecker::checkProtocolSelfRequirements(CD);
     }
 
     TypeChecker::checkDeclAttributes(CD);

lib/Sema/TypeCheckGeneric.cpp

@@ -246,6 +246,7 @@ void TypeChecker::checkProtocolSelfRequirements(ValueDecl *decl) {
   // For a generic requirement in a protocol, make sure that the requirement
   // set didn't add any requirements to Self or its associated types.
   if (auto *proto = dyn_cast<ProtocolDecl>(decl->getDeclContext())) {
+    auto &ctx = proto->getASTContext();
     auto protoSelf = proto->getSelfInterfaceType();
     auto sig = decl->getInnermostDeclContext()->getGenericSignatureOfContext();
     for (auto req : sig->getRequirements()) {
@@ -261,12 +262,12 @@ void TypeChecker::checkProtocolSelfRequirements(ValueDecl *decl) {
           req.getFirstType()->is<GenericTypeParamType>())
         continue;
 
-      diagnose(decl,
-               diag::requirement_restricts_self,
-               decl->getDescriptiveKind(), decl->getFullName(),
-               req.getFirstType().getString(),
-               static_cast<unsigned>(req.getKind()),
-               req.getSecondType().getString());
+      ctx.Diags.diagnose(decl,
+                         diag::requirement_restricts_self,
+                         decl->getDescriptiveKind(), decl->getFullName(),
+                         req.getFirstType().getString(),
+                         static_cast<unsigned>(req.getKind()),
+                         req.getSecondType().getString());
     }
   }
 }

lib/Sema/TypeChecker.h

@@ -1034,7 +1034,7 @@ class TypeChecker final : public LazyResolver {
 
   /// For a generic requirement in a protocol, make sure that the requirement
   /// set didn't add any requirements to Self or its associated types.
-  void checkProtocolSelfRequirements(ValueDecl *decl);
+  static void checkProtocolSelfRequirements(ValueDecl *decl);
 
   /// All generic parameters of a generic function must be referenced in the
   /// declaration's type, otherwise we have no way to infer them.