[ConstraintSystem] Use new ConformanceRequirement to record checked conformances and conditional requirements

Author: xedin

lib/Sema/CSApply.cpp

@@ -7971,10 +7971,12 @@ static Optional<SolutionApplicationTarget> applySolutionToForEachStmt(
   auto stmt = forEachStmtInfo.stmt;
   auto sequenceProto = TypeChecker::getProtocol(
       cs.getASTContext(), stmt->getForLoc(), KnownProtocolKind::Sequence);
-  auto contextualLocator = cs.getConstraintLocator(
-      target.getAsExpr(), LocatorPathElt::ContextualType());
-  auto sequenceConformance = solution.resolveConformance(
-      contextualLocator, sequenceProto);
+  auto contextualLocator = solution.getConstraintLocator(
+      target.getAsExpr(),
+      {LocatorPathElt::ContextualType(),
+       LocatorPathElt::ConformanceRequirement(sequenceProto)});
+  auto sequenceConformance =
+      solution.resolveConformance(contextualLocator, sequenceProto);
   assert(!sequenceConformance.isInvalid() &&
          "Couldn't find sequence conformance");
 
@@ -8385,32 +8387,30 @@ Expr *Solution::coerceToType(Expr *expr, Type toType,
 
 ProtocolConformanceRef Solution::resolveConformance(
     ConstraintLocator *locator, ProtocolDecl *proto) {
-  for (const auto &conformance : Conformances) {
-    if (conformance.first != locator)
-      continue;
-    if (conformance.second.getRequirement() != proto)
-      continue;
-
-    // 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);
-  }
-
-  return ProtocolConformanceRef::forInvalid();
+  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 {

lib/Sema/CSDiagnostics.cpp

@@ -211,12 +211,12 @@ ProtocolConformance *RequirementFailure::getConformanceForConditionalReq(
     return nullptr;
 
   auto path = locator->getPath();
-  auto *typeReqLoc = getConstraintLocator(getRawAnchor(), path.drop_back());
+  auto *conformanceLoc = getConstraintLocator(getRawAnchor(), path.drop_back());
 
   auto result = llvm::find_if(
       solution.Conformances,
       [&](const std::pair<ConstraintLocator *, ProtocolConformanceRef>
-              &conformance) { return conformance.first == typeReqLoc; });
+              &conformance) { return conformance.first == conformanceLoc; });
   assert(result != solution.Conformances.end());
 
   auto conformance = result->second;

lib/Sema/CSSimplify.cpp

@@ -5710,21 +5710,23 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
   /// Record the given conformance as the result, adding any conditional
   /// requirements if necessary.
   auto recordConformance = [&](ProtocolConformanceRef conformance) {
+    auto *conformanceLoc = getConstraintLocator(
+        loc, LocatorPathElt::ConformanceRequirement(protocol));
     // Record the conformance.
-    CheckedConformances.push_back({loc, conformance});
+    CheckedConformances.push_back({conformanceLoc, conformance});
 
-    if (isConformanceUnavailable(conformance, loc))
+    if (isConformanceUnavailable(conformance, conformanceLoc))
       increaseScore(SK_Unavailable);
 
     // This conformance may be conditional, in which case we need to consider
     // those requirements as constraints too.
     if (conformance.isConcrete()) {
       unsigned index = 0;
       for (const auto &req : conformance.getConditionalRequirements()) {
-        addConstraint(req,
-                      locator.withPathElement(
-                          LocatorPathElt::ConditionalRequirement(
-                              index++, req.getKind())));
+        addConstraint(
+            req, getConstraintLocator(conformanceLoc,
+                                      LocatorPathElt::ConditionalRequirement(
+                                          index++, req.getKind())));
       }
     }
 

lib/Sema/ConstraintSystem.cpp

@@ -5180,15 +5180,15 @@ static Optional<Requirement> getRequirement(ConstraintSystem &cs,
 
   if (reqLoc->isConditionalRequirement()) {
     auto path = reqLocator->getPath();
-    auto *typeReqLoc =
+    auto *conformanceLoc =
         cs.getConstraintLocator(reqLocator->getAnchor(), path.drop_back());
 
     auto conformances = cs.getCheckedConformances();
     auto result = llvm::find_if(
         conformances,
-        [&typeReqLoc](
+        [&conformanceLoc](
             const std::pair<ConstraintLocator *, ProtocolConformanceRef>
-                &conformance) { return conformance.first == typeReqLoc; });
+                &conformance) { return conformance.first == conformanceLoc; });
     assert(result != conformances.end());
 
     auto conformance = result->second;