Merge pull request #41074 from AnthonyLatsis/miss-conf-error

ConformanceChecker: Minor diagnostics QoI improvements

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));