[CSStep] Print disjunctions with bindOverload choices.

Print all disjunctions in scope, not just the one selected. Remove conjunction printing.

Author: Amritpan Kaur

lib/Sema/CSStep.cpp

@@ -356,7 +356,6 @@ StepResult ComponentStep::take(bool prevFailed) {
   });
 
   auto *disjunction = CS.selectDisjunction();
-  auto *conjunction = CS.selectConjunction();
 
   if (CS.isDebugMode()) {
     PrintOptions PO;
@@ -369,18 +368,24 @@ StepResult ComponentStep::take(bool prevFailed) {
     }
     log.indent(CS.solverState->getCurrentIndent());
 
-    if (disjunction) {
-      log.indent(2);
-      log << "Disjunction(s) = [";
+    SmallVector<Constraint *, 4> disjunctions;
+    CS.collectDisjunctions(disjunctions);
+    std::vector<std::string> choicesWithBindOverload;
+    for (const auto &disjunction : disjunctions) {
+      bool isBindOverload = false;
       auto constraints = disjunction->getNestedConstraints();
-      log << constraints[0]->getFirstType()->getString(PO);
-      log << "]";
+      for (const auto &choice : constraints) {
+        if (choice->getKind() == ConstraintKind::BindOverload)
+          isBindOverload = true;
+      }
+      if (isBindOverload)
+        choicesWithBindOverload.push_back(
+            constraints.front()->getFirstType()->getString(PO));
     }
-    if (conjunction) {
+    if (!choicesWithBindOverload.empty()) {
       log.indent(2);
-      log << "Conjunction(s) = [";
-      auto constraints = conjunction->getNestedConstraints();
-      log << constraints[0]->getFirstType()->getString(PO);
+      log << "Disjunction(s) = [";
+      interleave(choicesWithBindOverload, log, ", ");
       log << "]";
     }
     log << ")\n";