AST: Remove InverseRequirement::enumerateDefaultedParams()

Author: slavapestov

include/swift/AST/Requirement.h

@@ -251,11 +251,6 @@ struct InverseRequirement {
 
   InvertibleProtocolKind getKind() const;
 
-  /// Adds the type parameters of this generic context to the result if
-  /// it has default requirements.
-  static void enumerateDefaultedParams(GenericContext *decl,
-                                       SmallVectorImpl<Type> &result);
-
   /// Appends additional requirements corresponding to defaults for the given
   /// generic parameters.
   static void expandDefaults(ASTContext &ctx,

lib/AST/Requirement.cpp

@@ -316,32 +316,6 @@ InvertibleProtocolKind InverseRequirement::getKind() const {
   return *getInvertibleProtocolKind(*(protocol->getKnownProtocolKind()));
 }
 
-void InverseRequirement::enumerateDefaultedParams(
-    GenericContext *genericContext,
-    SmallVectorImpl<Type> &result) {
-
-  auto add = [&](Type t) {
-    assert(t->isTypeParameter());
-    result.push_back(t);
-  };
-
-  // Nothing to enumerate if it's not generic.
-  if (!genericContext->isGeneric())
-    return;
-
-  if (auto proto = dyn_cast<ProtocolDecl>(genericContext)) {
-    add(proto->getSelfInterfaceType());
-
-    for (auto *assocTypeDecl : proto->getAssociatedTypeMembers())
-      add(assocTypeDecl->getDeclaredInterfaceType());
-
-    return;
-  }
-
-  for (GenericTypeParamDecl *gtpd : *genericContext->getGenericParams())
-    add(gtpd->getDeclaredInterfaceType());
-}
-
 void InverseRequirement::expandDefaults(
     ASTContext &ctx,
     ArrayRef<Type> gps,

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -869,7 +869,9 @@ StructuralRequirementsRequest::evaluate(Evaluator &evaluator,
   SmallVector<InverseRequirement> inverses;
 
   SmallVector<Type, 4> needsDefaultRequirements;
-  InverseRequirement::enumerateDefaultedParams(proto, needsDefaultRequirements);
+  needsDefaultRequirements.push_back(proto->getSelfInterfaceType());
+  for (auto *assocTypeDecl : proto->getAssociatedTypeMembers())
+    needsDefaultRequirements.push_back(assocTypeDecl->getDeclaredInterfaceType());
 
   auto &ctx = proto->getASTContext();
   auto selfTy = proto->getSelfInterfaceType();