checkReferencedGenericParams can be static

Author: hamishknight

lib/Sema/TypeCheckDecl.cpp

@@ -2578,7 +2578,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     (void) SD->getGenericSignature();
 
     if (!SD->isInvalid()) {
-      TC.checkReferencedGenericParams(SD);
+      TypeChecker::checkReferencedGenericParams(SD);
       checkGenericParams(SD->getGenericParams(), SD);
       TypeChecker::checkProtocolSelfRequirements(SD);
     }
@@ -3187,7 +3187,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     if (!FD->isInvalid()) {
       checkGenericParams(FD->getGenericParams(), FD);
-      TC.checkReferencedGenericParams(FD);
+      TypeChecker::checkReferencedGenericParams(FD);
       TypeChecker::checkProtocolSelfRequirements(FD);
     }
 
@@ -3428,7 +3428,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     if (!CD->isInvalid()) {
       checkGenericParams(CD->getGenericParams(), CD);
-      TC.checkReferencedGenericParams(CD);
+      TypeChecker::checkReferencedGenericParams(CD);
       TypeChecker::checkProtocolSelfRequirements(CD);
     }
 

lib/Sema/TypeCheckGeneric.cpp

@@ -421,6 +421,7 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
 
   // Check that every generic parameter type from the signature is
   // among referencedGenericParams.
+  auto &ctx = decl->getASTContext();
   for (auto *genParam : genericSig->getGenericParams()) {
     auto *paramDecl = genParam->getDecl();
     if (paramDecl->getDepth() != fnGenericParamsDepth)
@@ -438,9 +439,10 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
           continue;
       }
       // Produce an error that this generic parameter cannot be bound.
-      diagnose(paramDecl->getLoc(), diag::unreferenced_generic_parameter,
-               paramDecl->getNameStr());
-      decl->setInterfaceType(ErrorType::get(Context));
+      ctx.Diags.diagnose(paramDecl->getLoc(),
+                         diag::unreferenced_generic_parameter,
+                         paramDecl->getNameStr());
+      decl->setInterfaceType(ErrorType::get(ctx));
       decl->setInvalid();
     }
   }

lib/Sema/TypeChecker.h

@@ -1038,7 +1038,7 @@ class TypeChecker final : public LazyResolver {
 
   /// All generic parameters of a generic function must be referenced in the
   /// declaration's type, otherwise we have no way to infer them.
-  void checkReferencedGenericParams(GenericContext *dc);
+  static void checkReferencedGenericParams(GenericContext *dc);
 
   /// Construct a new generic environment for the given declaration context.
   ///