Merge pull request #28336 from xedin/restore-cs-debug-output

[ConstraintSystem] NFC: Fix type variable printing in connected compo…

Author: xedin

lib/Sema/ConstraintGraph.cpp

@@ -1403,8 +1403,11 @@ void ConstraintGraphNode::dump() const {
 
 void ConstraintGraph::print(ArrayRef<TypeVariableType *> typeVars,
                             llvm::raw_ostream &out) {
+  PrintOptions PO;
+  PO.PrintTypesForDebugging = true;
+
   for (auto typeVar : typeVars) {
-    (*this)[typeVar].print(out, 2);
+    (*this)[typeVar].print(out, 2, PO);
     out << "\n";
   }
 }

lib/Sema/TypeCheckConstraints.cpp

@@ -3697,7 +3697,7 @@ void ConstraintSystem::print(raw_ostream &out) const {
     if (rep == tv) {
       if (auto fixed = getFixedType(tv)) {
         out << " as ";
-        fixed->print(out);
+        Type(fixed).print(out, PO);
       } else {
         getPotentialBindings(tv).dump(out, 1);
       }