[ConstraintSystem] Fix build failures.

Author: hborla

lib/Sema/CSStep.cpp

@@ -664,8 +664,6 @@ bool DisjunctionStep::shortCircuitDisjunctionAt(
       currentChoice->getOverloadChoice().getDecl()->isOperator() &&
       lastSuccessfulChoice->getKind() == ConstraintKind::BindOverload &&
       lastSuccessfulChoice->getOverloadChoice().getDecl()->isOperator()) {
-    return true;
-  }
 
     // If we have a SIMD operator, and the prior choice was not a SIMD
     // Operator, we're done.
@@ -690,14 +688,14 @@ bool DisjunctionStep::shortCircuitDisjunctionAt(
           continue;
 
         auto choiceTyvar =
-            CS.getType(simplifyLocatorToAnchor(CS, overload.getFirst()))
+            CS.getType(simplifyLocatorToAnchor(overload.getFirst()))
                 ->getAs<TypeVariableType>();
         if (!choiceTyvar)
           continue;
 
         auto rep = CS.getRepresentative(choiceTyvar);
         if (lastRep != rep) {
-          CS.mergeEquivalenceClasses(rep, lastRep);
+          CS.mergeEquivalenceClasses(rep, lastRep, /*updateWorkList=*/false);
           lastRep = CS.getRepresentative(lastRep);
         }
       }

lib/Sema/CSStep.h

@@ -711,12 +711,12 @@ class DisjunctionStep final : public BindingStep<DisjunctionChoiceProducer> {
     if (!repr || repr == typeVar)
       return;
 
-    for (auto *resolved = getResolvedOverloads(); resolved;
-         resolved = resolved->Previous) {
-      if (!resolved->BoundType->isEqual(repr))
+    for (auto overload : CS.getResolvedOverloads()) {
+      auto resolved = overload.second;
+      if (!resolved.boundType->isEqual(repr))
         continue;
 
-      auto &representative = resolved->Choice;
+      auto &representative = resolved.choice;
       if (!representative.isDecl())
         return;