Merge pull request #65053 from xedin/cs-adjust-type-variable-printing

[ConstraintSystem] NFC: Print attributes/capabilities only for unboun…

Author: xedin

lib/Sema/CSBindings.cpp

@@ -1784,7 +1784,7 @@ void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
   PO.PrintTypesForDebugging = true;
 
   if (auto typeVar = getTypeVariable()) {
-    typeVar->print(out, PO);
+    typeVar->getImpl().print(out);
     out << " ";
   }
 

lib/Sema/TypeCheckConstraints.cpp

@@ -1442,14 +1442,14 @@ void ConstraintSystem::print(raw_ostream &out) const {
     auto rep = getRepresentative(tv);
     if (rep == tv) {
       if (auto fixed = getFixedType(tv)) {
-        tv->getImpl().print(out);
+        tv->print(out, PO);
         out << " as ";
         Type(fixed).print(out, PO);
       } else {
         const_cast<ConstraintSystem *>(this)->getBindingsFor(tv).dump(out, 1);
       }
     } else {
-      tv->getImpl().print(out);
+      tv->print(out, PO);
       out << " equivalent to ";
       Type(rep).print(out, PO);
     }

test/Constraints/init_literal_via_coercion.swift

@@ -7,15 +7,15 @@
 // CHECK: ---Constraint solving at [{{.*}}:12:1 - line:12:13]---
 // CHECK: (integer_literal_expr type='[[LITERAL_VAR:\$T[0-9]+]]' {{.*}}
 // CHECK: Type Variables:
-// CHECK: [[LITERAL_VAR]] [allows bindings to: {{.*}}] as UInt32 {{.*}}
+// CHECK: [[LITERAL_VAR]] as UInt32 {{.*}}
 // CHECK-NOT: disjunction (remembered) \[\[locator@{{.*}} [Coerce@{{.*}}\]\]]:
 _ = UInt32(0)
 
 // CHECK: ---Constraint solving at [{{.*}}22:1 - line:22:13]---
 // CHECK: (coerce_expr implicit type='[[CAST_TYPE:\$T[0-9]+]]' {{.*}}
 // CHECK-NEXT: (nil_literal_expr type='[[LITERAL_VAR:\$T[0-9]+]]' {{.*}}
 // CHECK: Type Variables:
-// CHECK: [[LITERAL_VAR]] [allows bindings to: {{.*}}] as Int? {{.*}}
+// CHECK: [[LITERAL_VAR]] as Int? {{.*}}
 // CHECK: disjunction (remembered) {{.*}}
 // CHECK-NEXT: >  [favored]  [[CAST_TYPE]] bind Int?
 // CHECK-NEXT: >             [[CAST_TYPE]] bind Int