[ConstraintSystem] NFC: Remove obsolete used/checked conformances cache

Author: xedin

include/swift/Sema/ConstraintSystem.h

@@ -1177,9 +1177,6 @@ class Solution {
   llvm::SmallMapVector<const CaseLabelItem *, CaseLabelItemInfo, 4>
       caseLabelItems;
 
-  std::vector<std::pair<ConstraintLocator *, ProtocolConformanceRef>>
-      Conformances;
-
   /// The set of functions that have been transformed by a result builder.
   llvm::MapVector<AnyFunctionRef, AppliedBuilderTransform>
       resultBuilderTransformed;
@@ -1255,11 +1252,6 @@ class Solution {
     return None;
   }
 
-  /// Retrieve a fully-resolved protocol conformance at the given locator
-  /// and with the given protocol.
-  ProtocolConformanceRef resolveConformance(ConstraintLocator *locator,
-                                            ProtocolDecl *proto);
-
   ConstraintLocator *getCalleeLocator(ConstraintLocator *locator,
                                       bool lookThroughApply = true) const;
 
@@ -2209,9 +2201,6 @@ class ConstraintSystem {
   /// each node had before introducing this type.
   llvm::SmallVector<std::pair<ASTNode, Type>, 8> addedNodeTypes;
 
-  std::vector<std::pair<ConstraintLocator *, ProtocolConformanceRef>>
-      CheckedConformances;
-
   /// The set of functions that have been transformed by a result builder.
   std::vector<std::pair<AnyFunctionRef, AppliedBuilderTransform>>
       resultBuilderTransformed;
@@ -2675,8 +2664,6 @@ class ConstraintSystem {
 
     unsigned numAddedNodeTypes;
 
-    unsigned numCheckedConformances;
-
     unsigned numDisabledConstraints;
 
     unsigned numFavoredConstraints;
@@ -3885,12 +3872,6 @@ class ConstraintSystem {
                           const DeclRefExpr *base = nullptr,
                           OpenedTypeMap *replacements = nullptr);
 
-  /// Retrieve a list of conformances established along the current solver path.
-  ArrayRef<std::pair<ConstraintLocator *, ProtocolConformanceRef>>
-  getCheckedConformances() const {
-    return CheckedConformances;
-  }
-
   /// Retrieve a list of generic parameter types solver has "opened" (replaced
   /// with a type variable) along the current path.
   ArrayRef<std::pair<ConstraintLocator *, ArrayRef<OpenedType>>>

lib/Sema/CSApply.cpp

@@ -8382,34 +8382,6 @@ Expr *Solution::coerceToType(Expr *expr, Type toType,
   return result;
 }
 
-ProtocolConformanceRef Solution::resolveConformance(
-    ConstraintLocator *locator, ProtocolDecl *proto) {
-  auto conformance = llvm::find_if(Conformances, [&locator](const auto &elt) {
-    return elt.first == locator;
-  });
-
-  if (conformance == Conformances.end())
-    return ProtocolConformanceRef::forInvalid();
-
-  // If the conformance doesn't require substitution, return it immediately.
-  auto conformanceRef = conformance->second;
-  if (conformanceRef.isAbstract())
-    return conformanceRef;
-
-  auto concrete = conformanceRef.getConcrete();
-  auto conformingType = concrete->getType();
-  if (!conformingType->hasTypeVariable())
-    return conformanceRef;
-
-  // Substitute into the conformance type, then look for a conformance
-  // again.
-  // FIXME: Should be able to perform the substitution using the Solution
-  // itself rather than another conforms-to-protocol check.
-  Type substConformingType = simplifyType(conformingType);
-  return TypeChecker::conformsToProtocol(substConformingType, proto,
-                                         constraintSystem->DC);
-}
-
 bool Solution::hasType(ASTNode node) const {
   auto result = nodeTypes.find(node);
   if (result != nodeTypes.end())

lib/Sema/CSSolver.cpp

@@ -185,9 +185,6 @@ Solution ConstraintSystem::finalize() {
   solution.solutionApplicationTargets = solutionApplicationTargets;
   solution.caseLabelItems = caseLabelItems;
 
-  for (auto &e : CheckedConformances)
-    solution.Conformances.push_back({e.first, e.second});
-
   for (const auto &transformed : resultBuilderTransformed) {
     solution.resultBuilderTransformed.insert(transformed);
   }
@@ -273,10 +270,6 @@ void ConstraintSystem::applySolution(const Solution &solution) {
       setCaseLabelItemInfo(info.first, info.second);
   }
 
-  // Register the conformances checked along the way to arrive to solution.
-  for (auto &conformance : solution.Conformances)
-    CheckedConformances.push_back(conformance);
-
   for (const auto &transformed : solution.resultBuilderTransformed) {
     resultBuilderTransformed.push_back(transformed);
   }
@@ -477,7 +470,6 @@ ConstraintSystem::SolverScope::SolverScope(ConstraintSystem &cs)
   numOpenedExistentialTypes = cs.OpenedExistentialTypes.size();
   numDefaultedConstraints = cs.DefaultedConstraints.size();
   numAddedNodeTypes = cs.addedNodeTypes.size();
-  numCheckedConformances = cs.CheckedConformances.size();
   numDisabledConstraints = cs.solverState->getNumDisabledConstraints();
   numFavoredConstraints = cs.solverState->getNumFavoredConstraints();
   numResultBuilderTransformed = cs.resultBuilderTransformed.size();
@@ -555,9 +547,6 @@ ConstraintSystem::SolverScope::~SolverScope() {
   }
   truncate(cs.addedNodeTypes, numAddedNodeTypes);
 
-  // Remove any conformances checked along the current path.
-  truncate(cs.CheckedConformances, numCheckedConformances);
-
   /// Remove any builder transformed closures.
   truncate(cs.resultBuilderTransformed, numResultBuilderTransformed);
 

lib/Sema/ConstraintSystem.cpp

@@ -2903,8 +2903,7 @@ size_t Solution::getTotalMemory() const {
          ConstraintRestrictions.getMemorySize() +
          llvm::capacity_in_bytes(Fixes) + DisjunctionChoices.getMemorySize() +
          OpenedTypes.getMemorySize() + OpenedExistentialTypes.getMemorySize() +
-         (DefaultedConstraints.size() * sizeof(void *)) +
-         Conformances.size() * sizeof(std::pair<ConstraintLocator *, ProtocolConformanceRef>);
+         (DefaultedConstraints.size() * sizeof(void *));
 }
 
 DeclContext *Solution::getDC() const { return constraintSystem->DC; }