Sema: Remove ConformanceCheckOptions parameter from checkGenericArguments()

Author: slavapestov

lib/Sema/TypeCheckAttr.cpp

@@ -2695,8 +2695,7 @@ TypeEraserHasViableInitRequest::evaluate(Evaluator &evaluator,
           genericSignature->getGenericParams(),
           genericSignature->getRequirements(),
           QuerySubstitutionMap{subMap},
-          TypeChecker::LookUpConformance(dc),
-          None);
+          TypeChecker::LookUpConformance(dc));
 
     if (result != RequirementCheckResult::Success) {
       unviable.push_back(
@@ -4383,20 +4382,14 @@ static bool typeCheckDerivativeAttr(ASTContext &Ctx, Decl *D,
         if (!source)
           return false;
         // Check if target's requirements are satisfied by source.
-        // Cancel diagnostics using `DiagnosticTransaction`.
-        // Diagnostics should not be emitted because this function is used to
-        // check candidates; if no candidates match, a separate diagnostic will
-        // be produced.
-        DiagnosticTransaction transaction(Ctx.Diags);
-        SWIFT_DEFER { transaction.abort(); };
+        // Use invalid 'SourceLoc's to suppress diagnostics.
         return TypeChecker::checkGenericArguments(
-                   derivative, originalName.Loc.getBaseNameLoc(),
-                   originalName.Loc.getBaseNameLoc(), Type(),
+                   derivative, SourceLoc(), SourceLoc(), Type(),
                    source->getGenericParams(), target->getRequirements(),
                    [](SubstitutableType *dependentType) {
                      return Type(dependentType);
                    },
-                   lookupConformance, None) == RequirementCheckResult::Success;
+                   lookupConformance) == RequirementCheckResult::Success;
       };
 
   auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {
@@ -4926,20 +4919,17 @@ void AttributeChecker::visitTransposeAttr(TransposeAttr *attr) {
         if (!source)
           return false;
         // Check if target's requirements are satisfied by source.
-        // Cancel diagnostics using `DiagnosticTransaction`.
+        // Use invalid 'SourceLoc's to suppress diagnostics.
         // Diagnostics should not be emitted because this function is used to
         // check candidates; if no candidates match, a separate diagnostic will
         // be produced.
-        DiagnosticTransaction transaction(Ctx.Diags);
-        SWIFT_DEFER { transaction.abort(); };
         return TypeChecker::checkGenericArguments(
-            transpose, originalName.Loc.getBaseNameLoc(),
-            originalName.Loc.getBaseNameLoc(), Type(),
+            transpose, SourceLoc(), SourceLoc(), Type(),
             source->getGenericParams(), target->getRequirements(),
             [](SubstitutableType *dependentType) {
               return Type(dependentType);
             },
-            lookupConformance, None) == RequirementCheckResult::Success;
+            lookupConformance) == RequirementCheckResult::Success;
       };
 
   auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {

lib/Sema/TypeCheckGeneric.cpp

@@ -754,14 +754,10 @@ RequirementCheckResult TypeChecker::checkGenericArguments(
     ArrayRef<Requirement> requirements,
     TypeSubstitutionFn substitutions,
     LookupConformanceFn conformances,
-    ConformanceCheckOptions conformanceOptions,
     GenericRequirementsCheckListener *listener,
     SubstOptions options) {
   bool valid = true;
 
-  // We handle any conditional requirements ourselves.
-  conformanceOptions |= ConformanceCheckFlags::SkipConditionalRequirements;
-
   struct RequirementSet {
     ArrayRef<Requirement> Requirements;
     SmallVector<ParentConditionalConformance, 4> Parents;
@@ -819,14 +815,12 @@ RequirementCheckResult TypeChecker::checkGenericArguments(
       case RequirementKind::Conformance: {
         // Protocol conformance requirements.
         auto proto = secondType->castTo<ProtocolType>();
-        // FIXME: This should track whether this should result in a private
-        // or non-private dependency.
-        // FIXME: Do we really need "used" at this point?
         // FIXME: Poor location information. How much better can we do here?
         // FIXME: This call should support listener to be able to properly
         //        diagnose problems with conformances.
         auto conformance = conformsToProtocol(firstType, proto->getDecl(), dc,
-                                              conformanceOptions, loc);
+                                              ConformanceCheckFlags::SkipConditionalRequirements,
+                                              loc);
 
         if (conformance) {
           // Report the conformance.

lib/Sema/TypeCheckProtocol.cpp

@@ -3957,7 +3957,7 @@ void ConformanceChecker::ensureRequirementsAreSatisfied() {
       proto->getRequirementSignature(),
       QuerySubstitutionMap{substitutions},
       TypeChecker::LookUpConformance(DC),
-      None, &listener);
+      &listener);
 
   switch (result) {
   case RequirementCheckResult::Success:
@@ -4435,7 +4435,7 @@ TypeChecker::conformsToProtocol(Type T, ProtocolDecl *Proto, DeclContext *DC,
         DC, ComplainLoc, noteLoc, T,
         {lookupResult.getRequirement()->getSelfInterfaceType()}, *condReqs,
         [](SubstitutableType *dependentType) { return Type(dependentType); },
-        LookUpConformance(DC), options);
+        LookUpConformance(DC));
     switch (conditionalCheckResult) {
     case RequirementCheckResult::Success:
       break;

lib/Sema/TypeCheckProtocolInference.cpp

@@ -1098,7 +1098,7 @@ bool AssociatedTypeInference::checkCurrentTypeWitnesses(
                                        sanitizedRequirements,
                                        QuerySubstitutionMap{substitutions},
                                        TypeChecker::LookUpConformance(dc),
-                                       None, nullptr, options);
+                                       nullptr, options);
   switch (result) {
   case RequirementCheckResult::Failure:
     ++NumSolutionStatesFailedCheck;
@@ -1146,7 +1146,6 @@ bool AssociatedTypeInference::checkConstrainedExtension(ExtensionDecl *ext) {
                        ext->getGenericSignature()->getRequirements(),
                        QueryTypeSubstitutionMap{subs},
                        LookUpConformanceInModule(ext->getModuleContext()),
-                       None,
                        nullptr, options)) {
   case RequirementCheckResult::Success:
   case RequirementCheckResult::SubstitutionFailure:

lib/Sema/TypeCheckType.cpp

@@ -675,8 +675,7 @@ static Type checkContextualRequirements(Type type,
         genericSig->getGenericParams(),
         genericSig->getRequirements(),
         QueryTypeSubstitutionMap{subMap},
-        TypeChecker::LookUpConformance(dc),
-        None);
+        TypeChecker::LookUpConformance(dc));
 
   switch (result) {
   case RequirementCheckResult::Failure:
@@ -914,7 +913,7 @@ Type TypeChecker::applyUnboundGenericArguments(
                             genericSig->getGenericParams(),
                             genericSig->getRequirements(),
                             QueryTypeSubstitutionMap{subs},
-                            LookUpConformance(dc), None);
+                            LookUpConformance(dc));
 
     switch (result) {
     case RequirementCheckResult::Failure:

lib/Sema/TypeChecker.h

@@ -681,16 +681,13 @@ std::string gatherGenericParamBindingsText(
 /// \param requirements The requirements against which the generic arguments
 /// should be checked.
 /// \param substitutions Substitutions from interface types of the signature.
-/// \param conformanceOptions The flags to use when checking conformance
-/// requirement.
 /// \param listener The generic check listener used to pick requirements and
 /// notify callers about diagnosed errors.
 RequirementCheckResult checkGenericArguments(
     DeclContext *dc, SourceLoc loc, SourceLoc noteLoc, Type owner,
     TypeArrayView<GenericTypeParamType> genericParams,
     ArrayRef<Requirement> requirements, TypeSubstitutionFn substitutions,
     LookupConformanceFn conformances,
-    ConformanceCheckOptions conformanceOptions,
     GenericRequirementsCheckListener *listener = nullptr,
     SubstOptions options = None);