Merge pull request #12153 from xedin/pretty-potentinal-bindings-output

Author: swift-ci

lib/Sema/ConstraintSystem.h

@@ -2641,35 +2641,32 @@ class ConstraintSystem {
       if (NumDefaultableBindings > 0)
         out << "#defaultable_bindings=" << NumDefaultableBindings << " ";
 
-      out << "bindings=";
-      if (!Bindings.empty()) {
-        interleave(Bindings,
-                   [&](const PotentialBinding &binding) {
-                     auto type = binding.BindingType;
-                     auto &ctx = type->getASTContext();
-                     llvm::SaveAndRestore<bool> debugConstraints(
-                         ctx.LangOpts.DebugConstraintSolver, true);
-                     switch (binding.Kind) {
-                     case AllowedBindingKind::Exact:
-                       break;
-
-                     case AllowedBindingKind::Subtypes:
-                       out << "(subtypes of) ";
-                       break;
-
-                     case AllowedBindingKind::Supertypes:
-                       out << "(supertypes of) ";
-                       break;
-                     }
-                     if (binding.DefaultedProtocol)
-                       out << "(default from "
-                           << (*binding.DefaultedProtocol)->getName() << ") ";
-                     out << type.getString();
-                   },
-                   [&]() { out << " "; });
-      } else {
-        out << "{}";
-      }
+      out << "bindings={";
+      interleave(Bindings,
+                 [&](const PotentialBinding &binding) {
+                   auto type = binding.BindingType;
+                   auto &ctx = type->getASTContext();
+                   llvm::SaveAndRestore<bool> debugConstraints(
+                       ctx.LangOpts.DebugConstraintSolver, true);
+                   switch (binding.Kind) {
+                   case AllowedBindingKind::Exact:
+                     break;
+
+                   case AllowedBindingKind::Subtypes:
+                     out << "(subtypes of) ";
+                     break;
+
+                   case AllowedBindingKind::Supertypes:
+                     out << "(supertypes of) ";
+                     break;
+                   }
+                   if (binding.DefaultedProtocol)
+                     out << "(default from "
+                         << (*binding.DefaultedProtocol)->getName() << ") ";
+                   out << type.getString();
+                 },
+                 [&]() { out << "; "; });
+      out << "}";
     }
 
     void dump(ConstraintSystem *cs,

test/Constraints/interpolation_segments.swift

@@ -16,30 +16,30 @@
 // CHECK-NEXT:  9:
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByStringLiteral) String)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByStringLiteral) String})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByIntegerLiteral) Int)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByIntegerLiteral) Int})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByStringLiteral) String)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByStringLiteral) String})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByIntegerLiteral) Int)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByIntegerLiteral) Int})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByStringLiteral) String)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByStringLiteral) String})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByIntegerLiteral) Int)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByIntegerLiteral) Int})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByStringLiteral) String)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByStringLiteral) String})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByIntegerLiteral) Int)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByIntegerLiteral) Int})
 
 // CHECK: (solving component #
-// CHECK: literal=3 bindings=(subtypes of) (default from ExpressibleByStringLiteral) String)
+// CHECK: literal=3 bindings={(subtypes of) (default from ExpressibleByStringLiteral) String})
 
 _ = "\(1), \(2), \(3), \(4)"