AST: Simplify GenericSignature::getLocalRequirements()

Author: slavapestov

include/swift/AST/GenericSignature.h

@@ -170,9 +170,6 @@ class GenericSignature {
   /// Stores a set of requirements on a type parameter. Used by
   /// GenericEnvironment for building archetypes.
   struct LocalRequirements {
-    Type anchor;
-
-    Type concreteType;
     Type superclass;
 
     RequiredProtocols protos;

lib/AST/GenericSignature.cpp

@@ -327,8 +327,7 @@ GenericSignature::LocalRequirements
 GenericSignatureImpl::getLocalRequirements(Type depType) const {
   assert(depType->isTypeParameter() && "Expected a type parameter here");
 
-  return getRequirementMachine()->getLocalRequirements(
-      depType, getGenericParams());
+  return getRequirementMachine()->getLocalRequirements(depType);
 }
 
 ASTContext &GenericSignatureImpl::getASTContext() const {

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -48,30 +48,21 @@ using namespace rewriting;
 /// Collects all requirements on a type parameter that are used to construct
 /// its ArchetypeType in a GenericEnvironment.
 GenericSignature::LocalRequirements
-RequirementMachine::getLocalRequirements(
-    Type depType,
-    ArrayRef<GenericTypeParamType *> genericParams) const {
+RequirementMachine::getLocalRequirements(Type depType) const {
   auto term = Context.getMutableTermForType(depType->getCanonicalType(),
                                             /*proto=*/nullptr);
   System.simplify(term);
   verify(term);
 
   GenericSignature::LocalRequirements result;
-  result.anchor = Map.getTypeForTerm(term, genericParams);
-  result.packShape = getReducedShape(depType, genericParams);
+  result.packShape = getReducedShape(depType, {});
 
   auto *props = Map.lookUpProperties(term);
   if (!props)
     return result;
 
-  if (props->isConcreteType()) {
-    result.concreteType = props->getConcreteType({}, term, Map);
-    return result;
-  }
-
-  if (props->hasSuperclassBound()) {
+  if (props->hasSuperclassBound())
     result.superclass = props->getSuperclassBound({}, term, Map);
-  }
 
   for (const auto *proto : props->getConformsTo())
     result.protos.push_back(const_cast<ProtocolDecl *>(proto));

lib/AST/RequirementMachine/RequirementMachine.h

@@ -140,8 +140,7 @@ class RequirementMachine final {
   // Generic signature queries. Generally you shouldn't have to construct a
   // RequirementMachine instance; instead, call the corresponding methods on
   // GenericSignature, which lazily create a RequirementMachine for you.
-  GenericSignature::LocalRequirements getLocalRequirements(Type depType,
-                      ArrayRef<GenericTypeParamType *> genericParams) const;
+  GenericSignature::LocalRequirements getLocalRequirements(Type depType) const;
   bool requiresClass(Type depType) const;
   LayoutConstraint getLayoutConstraint(Type depType) const;
   bool requiresProtocol(Type depType, const ProtocolDecl *proto) const;