[CSStep] Add disjunction and conjunction printing to initial state displayed during component step.

Author: Amritpan Kaur

lib/Sema/CSStep.cpp

@@ -342,13 +342,35 @@ StepResult ComponentStep::take(bool prevFailed) {
 
   /// Try to figure out what this step is going to be,
   /// after the scope has been established.
+  auto bestBindings = CS.determineBestBindings();
   auto *disjunction = CS.selectDisjunction();
-  const bool isSolverStep = !IsSingle;
-  auto bestBindings = CS.determineBestBindings(isSolverStep);
-  if (isSolverStep) {
-    auto &log = getDebugLogger();
-    log << ")" << '\n';
-    log.indent(0);
+  auto *conjunction = CS.selectConjunction();
+  
+  if (CS.isDebugMode()) {
+    if (!IsSingle) {
+      PrintOptions PO;
+      PO.PrintTypesForDebugging = true;
+      if (disjunction) {
+        auto &log = getDebugLogger();
+        log.indent(CS.solverState->depth);
+        log << "(disjunction = [";
+        auto constraints = disjunction->getNestedConstraints();
+        log << constraints[0]->getFirstType()->getString(PO);
+        log << "])\n";
+      }
+      if (conjunction) {
+        auto &log = getDebugLogger();
+        log.indent(CS.solverState->depth);
+        log << "(conjunction = [";
+        auto constraints = conjunction->getNestedConstraints();
+        log << constraints[0]->getFirstType()->getString(PO);
+        log << "])\n";
+      }
+      auto &log = getDebugLogger();
+      log.indent(2);
+      log << ")" << '\n';
+      log.indent(0);
+    }
   }
 
   if (CS.shouldAttemptFixes()) {