[NFC] TypeChecker: Remove the old diagnosing 'checkGenericArguments'

Author: AnthonyLatsis

lib/Sema/TypeCheckGeneric.cpp

@@ -887,119 +887,6 @@ void TypeChecker::diagnoseRequirementFailure(
       ctx.Diags, noteLoc, reqFailureInfo.ReqPath);
 }
 
-RequirementCheckResult TypeChecker::checkGenericArguments(
-    ModuleDecl *module, SourceLoc loc, SourceLoc noteLoc, Type owner,
-    TypeArrayView<GenericTypeParamType> genericParams,
-    ArrayRef<Requirement> requirements,
-    TypeSubstitutionFn substitutions,
-    SubstOptions options) {
-  bool valid = true;
-
-  struct RequirementSet {
-    ArrayRef<Requirement> Requirements;
-    SmallVector<ParentConditionalConformance, 4> Parents;
-  };
-
-  SmallVector<RequirementSet, 8> pendingReqs;
-  pendingReqs.push_back({requirements, {}});
-
-  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, LookUpConformanceInModule(module), options);
-        if (!substed) {
-          // Another requirement will fail later; just continue.
-          valid = false;
-          continue;
-        }
-
-        req = *substed;
-      }
-
-      ArrayRef<Requirement> conditionalRequirements;
-      if (req.isSatisfied(conditionalRequirements, /*allowMissing=*/true)) {
-        if (!conditionalRequirements.empty()) {
-          assert(req.getKind() == RequirementKind::Conformance);
-
-          auto history = current.Parents;
-          history.push_back({req.getFirstType(), req.getProtocolDecl()});
-          pendingReqs.push_back({conditionalRequirements, std::move(history)});
-        }
-        continue;
-      }
-
-      if (loc.isValid()) {
-        Diag<Type, Type, Type> diagnostic;
-        Diag<Type, Type, StringRef> diagnosticNote;
-
-        switch (req.getKind()) {
-        case RequirementKind::Conformance: {
-          diagnoseConformanceFailure(req.getFirstType(), req.getProtocolDecl(),
-                                     module, loc);
-
-          if (current.Parents.empty())
-            return RequirementCheckResult::Failure;
-
-          diagnostic = diag::type_does_not_conform_owner;
-          diagnosticNote = diag::type_does_not_inherit_or_conform_requirement;
-          break;
-        }
-
-        case RequirementKind::Layout:
-          diagnostic = diag::type_is_not_a_class;
-          diagnosticNote = diag::anyobject_requirement;
-          break;
-
-        case RequirementKind::Superclass:
-          diagnostic = diag::type_does_not_inherit;
-          diagnosticNote = diag::type_does_not_inherit_or_conform_requirement;
-          break;
-
-        case RequirementKind::SameType:
-          diagnostic = diag::types_not_equal;
-          diagnosticNote = diag::types_not_equal_requirement;
-          break;
-        }
-
-        Type rawSecondType, secondType;
-        if (req.getKind() != RequirementKind::Layout) {
-          rawSecondType = rawReq.getSecondType();
-          secondType = req.getSecondType();
-        }
-
-        // FIXME: Poor source-location information.
-        ctx.Diags.diagnose(loc, diagnostic, owner,
-                           req.getFirstType(), secondType);
-
-        std::string genericParamBindingsText;
-        if (!genericParams.empty()) {
-          genericParamBindingsText =
-            gatherGenericParamBindingsText(
-              {rawReq.getFirstType(), rawSecondType},
-              genericParams, substitutions);
-        }
-        ctx.Diags.diagnose(noteLoc, diagnosticNote,
-                           rawReq.getFirstType(), rawSecondType,
-                           genericParamBindingsText);
-
-        ParentConditionalConformance::diagnoseConformanceStack(
-            ctx.Diags, noteLoc, current.Parents);
-      }
-
-      return RequirementCheckResult::Failure;
-    }
-  }
-
-  if (valid)
-    return RequirementCheckResult::Success;
-  return RequirementCheckResult::SubstitutionFailure;
-}
-
 CheckGenericArgumentsResult TypeChecker::checkGenericArgumentsForDiagnostics(
     ModuleDecl *module, ArrayRef<Requirement> requirements,
     TypeSubstitutionFn substitutions) {

lib/Sema/TypeChecker.h

@@ -510,23 +510,6 @@ void diagnoseRequirementFailure(
     TypeArrayView<GenericTypeParamType> genericParams,
     TypeSubstitutionFn substitutions, ModuleDecl *module);
 
-/// Check the given set of generic arguments against the requirements in a
-/// generic signature.
-///
-/// \param module The module to use for conformace lookup.
-/// \param loc The location at which any diagnostics should be emitted.
-/// \param noteLoc The location at which any notes will be printed.
-/// \param owner The type that owns the generic signature.
-/// \param genericParams The generic parameters being substituted.
-/// \param requirements The requirements against which the generic arguments
-/// should be checked.
-/// \param substitutions Substitutions from interface types of the signature.
-RequirementCheckResult checkGenericArguments(
-    ModuleDecl *module, SourceLoc loc, SourceLoc noteLoc, Type owner,
-    TypeArrayView<GenericTypeParamType> genericParams,
-    ArrayRef<Requirement> requirements, TypeSubstitutionFn substitutions,
-    SubstOptions options = None);
-
 /// Check the given generic parameter substitutions against the given
 /// requirements and report on any requirement failures in detail for
 /// diagnostic needs.