[NFC] Supplant RequirementCheckResult with CheckGenericArgumentsResult::Kind

Author: AnthonyLatsis

lib/Sema/CSStep.cpp

@@ -616,7 +616,7 @@ bool IsDeclRefinementOfRequest::evaluate(Evaluator &evaluator,
       genericSignatureB.getRequirements(),
       QueryTypeSubstitutionMap{ substMap });
 
-  if (result != RequirementCheckResult::Success)
+  if (result != CheckGenericArgumentsResult::Success)
     return false;
 
   return substTypeA->isEqual(substTypeB);

lib/Sema/CodeSynthesis.cpp

@@ -749,7 +749,7 @@ createDesignatedInitOverride(ClassDecl *classDecl,
           return GenericEnvironment::mapTypeIntoContext(
             genericEnv, substType);
         });
-    if (checkResult != RequirementCheckResult::Success)
+    if (checkResult != CheckGenericArgumentsResult::Success)
       return nullptr;
   }
 

lib/Sema/IDETypeCheckingRequests.cpp

@@ -134,9 +134,10 @@ static bool isExtensionAppliedInternal(const DeclContext *DC, Type BaseTy,
   auto *module = DC->getParentModule();
   SubstitutionMap substMap = BaseTy->getContextSubstitutionMap(
       module, ED->getExtendedNominal());
-  return TypeChecker::checkGenericArguments(
-      module, genericSig.getRequirements(),
-      QuerySubstitutionMap{substMap}) == RequirementCheckResult::Success;
+  return TypeChecker::checkGenericArguments(module,
+                                            genericSig.getRequirements(),
+                                            QuerySubstitutionMap{substMap}) ==
+         CheckGenericArgumentsResult::Success;
 }
 
 static bool isMemberDeclAppliedInternal(const DeclContext *DC, Type BaseTy,
@@ -170,9 +171,10 @@ static bool isMemberDeclAppliedInternal(const DeclContext *DC, Type BaseTy,
 
   // Note: we treat substitution failure as success, to avoid tripping
   // up over generic parameters introduced by the declaration itself.
-  return TypeChecker::checkGenericArguments(
-      module, genericSig.getRequirements(),
-      QuerySubstitutionMap{substMap}) != RequirementCheckResult::Failure;
+  return TypeChecker::checkGenericArguments(module,
+                                            genericSig.getRequirements(),
+                                            QuerySubstitutionMap{substMap}) !=
+         CheckGenericArgumentsResult::RequirementFailure;
 }
 
 bool

lib/Sema/TypeCheckAttr.cpp

@@ -2999,7 +2999,7 @@ TypeEraserHasViableInitRequest::evaluate(Evaluator &evaluator,
             return getSubstitution(type);
           });
 
-    if (result != RequirementCheckResult::Success) {
+    if (result != CheckGenericArgumentsResult::Success) {
       unviable.push_back(
           std::make_tuple(init, UnviableReason::UnsatisfiedRequirements,
                           genericParamType));

lib/Sema/TypeCheckGeneric.cpp

@@ -957,11 +957,9 @@ CheckGenericArgumentsResult TypeChecker::checkGenericArgumentsForDiagnostics(
   return CheckGenericArgumentsResult::createSuccess();
 }
 
-RequirementCheckResult
-TypeChecker::checkGenericArguments(ModuleDecl *module,
-                                   ArrayRef<Requirement> requirements,
-                                   TypeSubstitutionFn substitutions,
-                                   SubstOptions options) {
+CheckGenericArgumentsResult::Kind TypeChecker::checkGenericArguments(
+    ModuleDecl *module, ArrayRef<Requirement> requirements,
+    TypeSubstitutionFn substitutions, SubstOptions options) {
   SmallVector<Requirement, 4> worklist;
   bool valid = true;
 
@@ -978,15 +976,15 @@ TypeChecker::checkGenericArguments(ModuleDecl *module,
     auto req = worklist.pop_back_val();
     ArrayRef<Requirement> conditionalRequirements;
     if (!req.isSatisfied(conditionalRequirements, /*allowMissing=*/true))
-      return RequirementCheckResult::Failure;
+      return CheckGenericArgumentsResult::RequirementFailure;
 
     worklist.append(conditionalRequirements.begin(),
                     conditionalRequirements.end());
   }
 
   if (valid)
-    return RequirementCheckResult::Success;
-  return RequirementCheckResult::SubstitutionFailure;
+    return CheckGenericArgumentsResult::Success;
+  return CheckGenericArgumentsResult::SubstitutionFailure;
 }
 
 Requirement

lib/Sema/TypeCheckProtocol.cpp

@@ -5676,11 +5676,11 @@ TypeChecker::conformsToProtocol(Type T, ProtocolDecl *Proto, ModuleDecl *M,
         M, *condReqs,
         [](SubstitutableType *dependentType) { return Type(dependentType); });
     switch (conditionalCheckResult) {
-    case RequirementCheckResult::Success:
+    case CheckGenericArgumentsResult::Success:
       break;
 
-    case RequirementCheckResult::Failure:
-    case RequirementCheckResult::SubstitutionFailure:
+    case CheckGenericArgumentsResult::RequirementFailure:
+    case CheckGenericArgumentsResult::SubstitutionFailure:
       return ProtocolConformanceRef::forInvalid();
     }
   }

lib/Sema/TypeCheckProtocolInference.cpp

@@ -1135,12 +1135,12 @@ bool AssociatedTypeInference::checkCurrentTypeWitnesses(
   switch (TypeChecker::checkGenericArguments(
       dc->getParentModule(), sanitizedRequirements,
       QuerySubstitutionMap{substitutions}, options)) {
-  case RequirementCheckResult::Failure:
+  case CheckGenericArgumentsResult::RequirementFailure:
     ++NumSolutionStatesFailedCheck;
     return true;
 
-  case RequirementCheckResult::Success:
-  case RequirementCheckResult::SubstitutionFailure:
+  case CheckGenericArgumentsResult::Success:
+  case CheckGenericArgumentsResult::SubstitutionFailure:
     break;
   }
 
@@ -1178,11 +1178,11 @@ bool AssociatedTypeInference::checkConstrainedExtension(ExtensionDecl *ext) {
   switch (TypeChecker::checkGenericArguments(
       dc->getParentModule(), ext->getGenericSignature().getRequirements(),
       QueryTypeSubstitutionMap{subs}, options)) {
-  case RequirementCheckResult::Success:
-  case RequirementCheckResult::SubstitutionFailure:
+  case CheckGenericArgumentsResult::Success:
+  case CheckGenericArgumentsResult::SubstitutionFailure:
     return false;
 
-  case RequirementCheckResult::Failure:
+  case CheckGenericArgumentsResult::RequirementFailure:
     return true;
   }
   llvm_unreachable("unhandled result");

lib/Sema/TypeChecker.h

@@ -209,11 +209,6 @@ struct ParentConditionalConformance {
                            ArrayRef<ParentConditionalConformance> conformances);
 };
 
-/// The result of `checkGenericRequirement`.
-enum class RequirementCheckResult {
-  Success, Failure, SubstitutionFailure
-};
-
 class CheckGenericArgumentsResult {
 public:
   enum Kind { Success, RequirementFailure, SubstitutionFailure };
@@ -522,11 +517,10 @@ checkGenericArgumentsForDiagnostics(ModuleDecl *module,
 /// requirements. Unlike \c checkGenericArgumentsForDiagnostics, this version
 /// reports just the result of the check and doesn't provide additional
 /// information on requirement failures that is warranted for diagnostics.
-RequirementCheckResult checkGenericArguments(
-    ModuleDecl *module,
-    ArrayRef<Requirement> requirements,
-    TypeSubstitutionFn substitutions,
-    SubstOptions options = None);
+CheckGenericArgumentsResult::Kind
+checkGenericArguments(ModuleDecl *module, ArrayRef<Requirement> requirements,
+                      TypeSubstitutionFn substitutions,
+                      SubstOptions options = None);
 
 /// Checks whether the generic requirements imposed on the nested type
 /// declaration \p decl (if present) are in agreement with the substitutions