Fix unbalanced braces in debugging output

Author: abdulowork

lib/Sema/CSSolver.cpp

@@ -353,6 +353,10 @@ bool ConstraintSystem::simplify() {
     auto *constraint = &ActiveConstraints.front();
     deactivateConstraint(constraint);
 
+    auto isSimplifiable =
+        constraint->getKind() != ConstraintKind::Disjunction &&
+        constraint->getKind() != ConstraintKind::Conjunction;
+
     if (isDebugMode()) {
       auto &log = llvm::errs();
       log.indent(solverState->getCurrentIndent());
@@ -362,8 +366,7 @@ bool ConstraintSystem::simplify() {
 
       // {Dis, Con}junction are returned unsolved in \c simplifyConstraint() and
       // handled separately by solver steps.
-      if (constraint->getKind() != ConstraintKind::Disjunction &&
-          constraint->getKind() != ConstraintKind::Conjunction) {
+      if (isSimplifiable) {
         log.indent(solverState->getCurrentIndent() + 2)
             << "(simplification result:\n";
       }
@@ -375,7 +378,9 @@ bool ConstraintSystem::simplify() {
       retireFailedConstraint(constraint);
       if (isDebugMode()) {
         auto &log = llvm::errs();
-        log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        if (isSimplifiable) {
+          log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        }
         log.indent(solverState->getCurrentIndent() + 2) << "(outcome: error)\n";
       }
       break;
@@ -386,7 +391,9 @@ bool ConstraintSystem::simplify() {
       retireConstraint(constraint);
       if (isDebugMode()) {
         auto &log = llvm::errs();
-        log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        if (isSimplifiable) {
+          log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        }
         log.indent(solverState->getCurrentIndent() + 2)
             << "(outcome: simplified)\n";
       }
@@ -397,7 +404,9 @@ bool ConstraintSystem::simplify() {
         ++solverState->NumUnsimplifiedConstraints;
       if (isDebugMode()) {
         auto &log = llvm::errs();
-        log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        if (isSimplifiable) {
+          log.indent(solverState->getCurrentIndent() + 2) << ")\n";
+        }
         log.indent(solverState->getCurrentIndent() + 2)
             << "(outcome: unsolved)\n";
       }

lib/Sema/CSStep.cpp

@@ -361,12 +361,6 @@ StepResult ComponentStep::take(bool prevFailed) {
   auto *disjunction = CS.selectDisjunction();
 
   if (CS.isDebugMode()) {
-    if (!potentialBindings.empty()) {
-      auto &log = getDebugLogger();
-      log << "(Potential Binding(s): " << '\n';
-      log << potentialBindings;
-    }
-
     SmallVector<Constraint *, 4> disjunctions;
     CS.collectDisjunctions(disjunctions);
     std::vector<std::string> overloadDisjunctions;
@@ -379,17 +373,24 @@ StepResult ComponentStep::take(bool prevFailed) {
         overloadDisjunctions.push_back(
             constraints[0]->getFirstType()->getString(PO));
     }
+
+    if (!potentialBindings.empty() || !overloadDisjunctions.empty()) {
+      auto &log = getDebugLogger();
+      log << "(Potential Binding(s): " << '\n';
+      log << potentialBindings;
+    }
+
     if (!overloadDisjunctions.empty()) {
       auto &log = getDebugLogger();
       log.indent(2);
       log << "Disjunction(s) = [";
       interleave(overloadDisjunctions, log, ", ");
       log << "]\n";
+    }
 
-      if (!potentialBindings.empty() || !overloadDisjunctions.empty()) {
-        auto &log = getDebugLogger();
-        log << ")\n";
-      }
+    if (!potentialBindings.empty() || !overloadDisjunctions.empty()) {
+      auto &log = getDebugLogger();
+      log << ")\n";
     }
   }
 
@@ -671,7 +672,7 @@ bool DisjunctionStep::shouldSkip(const DisjunctionChoice &choice) const {
       auto &log = getDebugLogger();
       log << "(skipping " + reason + " ";
       choice.print(log, &ctx.SourceMgr);
-      log << '\n';
+      log << ")\n";
     }
 
     return true;