Merge pull request #35453 from xedin/extract-potential-bindings-into-header

[ConstraintSystem] NFC: Extract `PotentialBinding(s)` and auxiliary types/logic into separate header and namespace

Author: xedin

include/swift/Sema/CSBindings.h

@@ -565,8 +565,8 @@ template <typename P> class BindingStep : public SolverStep {
 };
 
 class TypeVariableStep final : public BindingStep<TypeVarBindingProducer> {
-  using BindingContainer = ConstraintSystem::PotentialBindings;
-  using Binding = ConstraintSystem::PotentialBinding;
+  using BindingContainer = inference::PotentialBindings;
+  using Binding = inference::PotentialBinding;
 
   TypeVariableType *TypeVar;
 

include/swift/Sema/ConstraintSystem.h

@@ -38,6 +38,7 @@
 
 using namespace swift;
 using namespace constraints;
+using namespace inference;
 
 #define DEBUG_TYPE "ConstraintSystem"
 
@@ -5295,8 +5296,7 @@ bool ConstraintSystem::isReadOnlyKeyPathComponent(
   return false;
 }
 
-TypeVarBindingProducer::TypeVarBindingProducer(
-    ConstraintSystem::PotentialBindings &bindings)
+TypeVarBindingProducer::TypeVarBindingProducer(PotentialBindings &bindings)
     : BindingProducer(bindings.CS, bindings.TypeVar->getImpl().getLocator()),
       TypeVar(bindings.TypeVar), CanBeNil(bindings.canBeNil()) {
   if (bindings.isDirectHole()) {
@@ -5406,7 +5406,7 @@ bool TypeVarBindingProducer::requiresOptionalAdjustment(
   return false;
 }
 
-ConstraintSystem::PotentialBinding
+PotentialBinding
 TypeVarBindingProducer::getDefaultBinding(Constraint *constraint) const {
   assert(constraint->getKind() == ConstraintKind::Defaultable ||
          constraint->getKind() == ConstraintKind::DefaultClosureType);

lib/Sema/CSBindings.cpp

@@ -19,6 +19,7 @@
 using namespace swift;
 using namespace swift::unittest;
 using namespace swift::constraints;
+using namespace swift::constraints::inference;
 
 TEST_F(SemaTest, TestIntLiteralBindingInference) {
   ConstraintSystemOptions options;
@@ -124,8 +125,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
     ASSERT_EQ(bindings.Bindings.size(), (unsigned)0);
     ASSERT_EQ(bindings.Literals.size(), (unsigned)0);
 
-    llvm::SmallDenseMap<TypeVariableType *, ConstraintSystem::PotentialBindings>
-        env;
+    llvm::SmallDenseMap<TypeVariableType *, PotentialBindings> env;
     env.insert({floatLiteralTy, cs.inferBindingsFor(floatLiteralTy)});
 
     bindings.finalize(env);

lib/Sema/CSStep.h

@@ -26,6 +26,7 @@
 
 using namespace swift;
 using namespace swift::unittest;
+using namespace swift::constraints::inference;
 
 SemaTest::SemaTest()
     : Context(*ASTContext::get(LangOpts, TypeCheckerOpts, SearchPathOpts,
@@ -120,10 +121,9 @@ ProtocolType *SemaTest::createProtocol(llvm::StringRef protocolName,
   return ProtocolType::get(PD, parent, Context);
 }
 
-ConstraintSystem::PotentialBindings
-SemaTest::inferBindings(ConstraintSystem &cs, TypeVariableType *typeVar) {
-  llvm::SmallDenseMap<TypeVariableType *, ConstraintSystem::PotentialBindings>
-      cache;
+PotentialBindings SemaTest::inferBindings(ConstraintSystem &cs,
+                                          TypeVariableType *typeVar) {
+  llvm::SmallDenseMap<TypeVariableType *, PotentialBindings> cache;
 
   for (auto *typeVar : cs.getTypeVariables()) {
     if (!typeVar->getImpl().hasRepresentativeOrFixed())

lib/Sema/ConstraintSystem.cpp

@@ -28,6 +28,7 @@
 #include <string>
 
 using namespace swift::constraints;
+using namespace swift::constraints::inference;
 
 namespace swift {
 namespace unittest {
@@ -75,8 +76,8 @@ class SemaTest : public SemaTestBase {
   ProtocolType *createProtocol(llvm::StringRef protocolName,
                                Type parent = Type());
 
-  static ConstraintSystem::PotentialBindings
-  inferBindings(ConstraintSystem &cs, TypeVariableType *typeVar);
+  static PotentialBindings inferBindings(ConstraintSystem &cs,
+                                         TypeVariableType *typeVar);
 };
 
 } // end namespace unittest