Merge pull request #61103 from amritpan/format-fixes

[ConstraintSystem] Format fixes to the type inference debug output.

Author: xedin

lib/Sema/CSBindings.cpp

@@ -1656,8 +1656,6 @@ void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
   PrintOptions PO;
   PO.PrintTypesForDebugging = true;
 
-  out.indent(indent);
-  out << "(";
   if (auto typeVar = getTypeVariable()) {
     typeVar->print(out, PO);
     out << " ";
@@ -1814,7 +1812,7 @@ void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
     }
     out << "]";
   }
-  out << ")";
+  
 }
 
 // Given a possibly-Optional type, return the direct superclass of the

lib/Sema/CSStep.cpp

@@ -351,8 +351,10 @@ StepResult ComponentStep::take(bool prevFailed) {
 
   auto bestBindings = CS.determineBestBindings([&](const BindingSet &bindings) {
     if (CS.isDebugMode() && bindings.hasViableBindings()) {
+      bos.indent(CS.solverState->getCurrentIndent() + 2);
+      bos << "(";
       bindings.dump(bos, CS.solverState->getCurrentIndent() + 2);
-      bos << "\n";
+      bos << ")\n";
     }
   });
 

lib/Sema/Constraint.cpp

@@ -388,13 +388,14 @@ void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm, unsigned inden
 
     interleave(sortedConstraints,
                [&](Constraint *constraint) {
+                Out.indent(indent);
                  if (constraint->isDisabled())
                    Out << ">  [disabled] ";
                  else if (constraint->isFavored())
                    Out << ">  [favored]  ";
                  else
                    Out << ">             ";
-                 constraint->print(Out, sm,
+                 constraint->print(Out, sm, indent,
                    /*skipLocator=*/constraint->getLocator() == Locator);
                },
                [&] { Out << "\n"; });

lib/Sema/ConstraintGraph.cpp

@@ -1651,7 +1651,7 @@ void ConstraintGraph::dumpActiveScopeChanges(llvm::raw_ostream &out,
     for (const auto &constraint : addedConstraints) {
       out.indent(indent + 4);
       out << "> ";
-      constraint->print(out, &CS.getASTContext().SourceMgr);
+      constraint->print(out, &CS.getASTContext().SourceMgr, indent + 6);
       out << '\n';
     }
     out.indent(indent + 2);
@@ -1665,7 +1665,7 @@ void ConstraintGraph::dumpActiveScopeChanges(llvm::raw_ostream &out,
     for (const auto &constraint : removedConstraints) {
       out.indent(indent + 4);
       out << "> ";
-      constraint->print(out, &CS.getASTContext().SourceMgr);
+      constraint->print(out, &CS.getASTContext().SourceMgr, indent + 6);
       out << '\n';
     }
     out.indent(indent + 2);