Merge pull request swiftlang#60164 from amritpan/fix-conjunction-indentations

[ConstraintSystem] Fix indentations of AST in Conjunction Steps.

Author: xedin

include/swift/Sema/Constraint.h

@@ -855,7 +855,8 @@ class Constraint final : public llvm::ilist_node<Constraint>,
   /// Print constraint placed on type and constraint properties.
   ///
   /// \c skipLocator skips printing of locators.
-  void print(llvm::raw_ostream &Out, SourceManager *sm, bool skipLocator = false) const;
+  void print(llvm::raw_ostream &Out, SourceManager *sm, unsigned indent = 0,
+             bool skipLocator = false) const;
 
   SWIFT_DEBUG_DUMPER(dump(SourceManager *SM));
 

include/swift/Sema/ConstraintSystem.h

@@ -6117,7 +6117,7 @@ class DisjunctionChoice {
   bool isSymmetricOperator() const;
   bool isUnaryOperator() const;
 
-  void print(llvm::raw_ostream &Out, SourceManager *SM) const {
+  void print(llvm::raw_ostream &Out, SourceManager *SM, unsigned indent = 0) const {
     Out << "disjunction choice ";
     Choice->print(Out, SM);
   }
@@ -6149,9 +6149,9 @@ class ConjunctionElement {
 
   ConstraintLocator *getLocator() const { return Element->getLocator(); }
 
-  void print(llvm::raw_ostream &Out, SourceManager *SM) const {
+  void print(llvm::raw_ostream &Out, SourceManager *SM, unsigned indent) const {
     Out << "conjunction element ";
-    Element->print(Out, SM);
+    Element->print(Out, SM, indent);
   }
 
 private:
@@ -6186,7 +6186,7 @@ class TypeVariableBinding {
   Optional<std::pair<ConstraintFix *, unsigned>>
   fixForHole(ConstraintSystem &cs) const;
 
-  void print(llvm::raw_ostream &Out, SourceManager *) const {
+  void print(llvm::raw_ostream &Out, SourceManager *, unsigned indent) const {
     PrintOptions PO;
     PO.PrintTypesForDebugging = true;
     Out << "type variable " << TypeVar->getString(PO)

lib/Sema/CSStep.cpp

@@ -843,9 +843,6 @@ StepResult ConjunctionStep::resume(bool prevFailed) {
   // attempted to apply information gained from the
   // isolated constraint to the outer context.
   if (Snapshot && Snapshot->isScoped()) {
-    if (CS.isDebugMode())
-      getDebugLogger() << ")\n";
-
     return done(/*isSuccess=*/!prevFailed);
   }
 

lib/Sema/CSStep.h

@@ -519,7 +519,7 @@ template <typename P> class BindingStep : public SolverStep {
       if (CS.isDebugMode()) {
         auto &log = getDebugLogger();
         log << "(attempting ";
-        choice->print(log, &CS.getASTContext().SourceMgr);
+        choice->print(log, &CS.getASTContext().SourceMgr, CS.solverState->depth * 2 + 2);
         log << '\n';
       }
 
@@ -974,6 +974,9 @@ class ConjunctionStep : public BindingStep<ConjunctionElementProducer> {
       auto remainingTime = OuterTimeRemaining->second;
       CS.Timer.emplace(anchor, CS, remainingTime);
     }
+    
+    if (CS.isDebugMode())
+      getDebugLogger() << ")\n";
   }
 
   StepResult resume(bool prevFailed) override;

lib/Sema/Constraint.cpp

@@ -322,7 +322,7 @@ Constraint *Constraint::clone(ConstraintSystem &cs) const {
   llvm_unreachable("Unhandled ConstraintKind in switch.");
 }
 
-void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm, bool skipLocator) const {
+void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm, unsigned indent, bool skipLocator) const {
   // Print all type variables as $T0 instead of _ here.
   PrintOptions PO;
   PO.PrintTypesForDebugging = true;
@@ -382,10 +382,12 @@ void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm, bool skipLocat
       auto *patternBinding = cast<PatternBindingDecl>(element.get<Decl *>());
       Out << "pattern binding element @ ";
       Out << patternBindingElt->getIndex() << " : ";
-      patternBinding->getPattern(patternBindingElt->getIndex())->dump(Out);
+      Out << '\n';
+      patternBinding->getPattern(patternBindingElt->getIndex())->dump(Out, indent);
     } else {
       Out << "syntactic element ";
-      element.dump(Out);
+      Out << '\n';
+      element.dump(Out, indent);
     }
 
     return;