Sema: Remove conformance lookup callback parameter from checkGenericArguments()

All callers were just doing module lookups.

Author: slavapestov

lib/Sema/TypeCheckAttr.cpp

@@ -2691,11 +2691,10 @@ TypeEraserHasViableInitRequest::evaluate(Evaluator &evaluator,
 
     // Use invalid 'SourceLoc's to suppress diagnostics.
     auto result = TypeChecker::checkGenericArguments(
-          protocol, SourceLoc(), SourceLoc(), typeEraser,
+          dc, SourceLoc(), SourceLoc(), typeEraser,
           genericSignature->getGenericParams(),
           genericSignature->getRequirements(),
-          QuerySubstitutionMap{subMap},
-          LookUpConformanceInModule(dc->getParentModule()));
+          QuerySubstitutionMap{subMap});
 
     if (result != RequirementCheckResult::Success) {
       unviable.push_back(
@@ -4388,8 +4387,7 @@ static bool typeCheckDerivativeAttr(ASTContext &Ctx, Decl *D,
                    source->getGenericParams(), target->getRequirements(),
                    [](SubstitutableType *dependentType) {
                      return Type(dependentType);
-                   },
-                   lookupConformance) == RequirementCheckResult::Success;
+                   }) == RequirementCheckResult::Success;
       };
 
   auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {
@@ -4832,8 +4830,6 @@ doTransposeStaticAndInstanceSelfTypesMatch(AnyFunctionType *transposeType,
 
 void AttributeChecker::visitTransposeAttr(TransposeAttr *attr) {
   auto *transpose = cast<FuncDecl>(D);
-  auto lookupConformance =
-      LookUpConformanceInModule(D->getDeclContext()->getParentModule());
   auto originalName = attr->getOriginalFunctionName();
   auto *transposeInterfaceType =
       transpose->getInterfaceType()->castTo<AnyFunctionType>();
@@ -4928,8 +4924,7 @@ void AttributeChecker::visitTransposeAttr(TransposeAttr *attr) {
             source->getGenericParams(), target->getRequirements(),
             [](SubstitutableType *dependentType) {
               return Type(dependentType);
-            },
-            lookupConformance) == RequirementCheckResult::Success;
+            }) == RequirementCheckResult::Success;
       };
 
   auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {

lib/Sema/TypeCheckGeneric.cpp

@@ -753,7 +753,6 @@ RequirementCheckResult TypeChecker::checkGenericArguments(
     TypeArrayView<GenericTypeParamType> genericParams,
     ArrayRef<Requirement> requirements,
     TypeSubstitutionFn substitutions,
-    LookupConformanceFn conformances,
     GenericRequirementsCheckListener *listener,
     SubstOptions options) {
   bool valid = true;
@@ -766,14 +765,18 @@ RequirementCheckResult TypeChecker::checkGenericArguments(
   SmallVector<RequirementSet, 8> pendingReqs;
   pendingReqs.push_back({requirements, {}});
 
-  ASTContext &ctx = dc->getASTContext();
+  auto *module = dc->getParentModule();
+  ASTContext &ctx = module->getASTContext();
   while (!pendingReqs.empty()) {
     auto current = pendingReqs.pop_back_val();
 
     for (const auto &rawReq : current.Requirements) {
       auto req = rawReq;
       if (current.Parents.empty()) {
-        auto substed = rawReq.subst(substitutions, conformances, options);
+        auto substed = rawReq.subst(
+            substitutions,
+            LookUpConformanceInModule(module),
+            options);
         if (!substed) {
           // Another requirement will fail later; just continue.
           valid = false;

lib/Sema/TypeCheckProtocol.cpp

@@ -3956,7 +3956,6 @@ void ConformanceChecker::ensureRequirementsAreSatisfied() {
       { proto->getSelfInterfaceType() },
       proto->getRequirementSignature(),
       QuerySubstitutionMap{substitutions},
-      LookUpConformanceInModule(DC->getParentModule()),
       &listener);
 
   switch (result) {
@@ -4434,8 +4433,7 @@ TypeChecker::conformsToProtocol(Type T, ProtocolDecl *Proto, DeclContext *DC,
     auto conditionalCheckResult = checkGenericArguments(
         DC, ComplainLoc, noteLoc, T,
         {lookupResult.getRequirement()->getSelfInterfaceType()}, *condReqs,
-        [](SubstitutableType *dependentType) { return Type(dependentType); },
-        LookUpConformanceInModule(M));
+        [](SubstitutableType *dependentType) { return Type(dependentType); });
     switch (conditionalCheckResult) {
     case RequirementCheckResult::Success:
       break;

lib/Sema/TypeCheckProtocolInference.cpp

@@ -1097,7 +1097,6 @@ bool AssociatedTypeInference::checkCurrentTypeWitnesses(
                                        { proto->getSelfInterfaceType() },
                                        sanitizedRequirements,
                                        QuerySubstitutionMap{substitutions},
-                                       LookUpConformanceInModule(dc->getParentModule()),
                                        nullptr, options);
   switch (result) {
   case RequirementCheckResult::Failure:
@@ -1145,7 +1144,6 @@ bool AssociatedTypeInference::checkConstrainedExtension(ExtensionDecl *ext) {
                        ext->getGenericSignature()->getGenericParams(),
                        ext->getGenericSignature()->getRequirements(),
                        QueryTypeSubstitutionMap{subs},
-                       LookUpConformanceInModule(ext->getModuleContext()),
                        nullptr, options)) {
   case RequirementCheckResult::Success:
   case RequirementCheckResult::SubstitutionFailure:

lib/Sema/TypeCheckType.cpp

@@ -674,8 +674,7 @@ static Type checkContextualRequirements(Type type,
         dc, loc, noteLoc, type,
         genericSig->getGenericParams(),
         genericSig->getRequirements(),
-        QueryTypeSubstitutionMap{subMap},
-        LookUpConformanceInModule(dc->getParentModule()));
+        QueryTypeSubstitutionMap{subMap});
 
   switch (result) {
   case RequirementCheckResult::Failure:
@@ -914,8 +913,7 @@ Type TypeChecker::applyUnboundGenericArguments(
       checkGenericArguments(dc, loc, noteLoc, unboundType,
                             genericSig->getGenericParams(),
                             genericSig->getRequirements(),
-                            QueryTypeSubstitutionMap{subs},
-                            LookUpConformanceInModule(module));
+                            QueryTypeSubstitutionMap{subs});
 
     switch (result) {
     case RequirementCheckResult::Failure:

lib/Sema/TypeChecker.h

@@ -687,7 +687,6 @@ RequirementCheckResult checkGenericArguments(
     DeclContext *dc, SourceLoc loc, SourceLoc noteLoc, Type owner,
     TypeArrayView<GenericTypeParamType> genericParams,
     ArrayRef<Requirement> requirements, TypeSubstitutionFn substitutions,
-    LookupConformanceFn conformances,
     GenericRequirementsCheckListener *listener = nullptr,
     SubstOptions options = None);