Merge pull request #37736 from xedin/adjacent-var-printing

[ConstraintSystem] NFC: Print out adjacent type variables to a debug log

Author: xedin

lib/Sema/CSBindings.cpp

@@ -1549,6 +1549,9 @@ void BindingSet::dump(TypeVariableType *typeVar, llvm::raw_ostream &out,
 }
 
 void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
+  PrintOptions PO;
+  PO.PrintTypesForDebugging = true;
+
   out.indent(indent);
   if (isDirectHole())
     out << "hole ";
@@ -1561,16 +1564,18 @@ void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
   auto literalKind = getLiteralKind();
   if (literalKind != LiteralBindingKind::None)
     out << "literal=" << static_cast<int>(literalKind) << " ";
-  if (involvesTypeVariables())
-    out << "involves_type_vars ";
+  if (involvesTypeVariables()) {
+    out << "involves_type_vars=[";
+    interleave(AdjacentVars,
+               [&](const auto *typeVar) { out << typeVar->getString(PO); },
+               [&out]() { out << " "; });
+    out << "] ";
+  }
 
   auto numDefaultable = getNumViableDefaultableBindings();
   if (numDefaultable > 0)
     out << "#defaultable_bindings=" << numDefaultable << " ";
 
-  PrintOptions PO;
-  PO.PrintTypesForDebugging = true;
-
   auto printBinding = [&](const PotentialBinding &binding) {
     auto type = binding.BindingType;
     switch (binding.Kind) {