Sema: Pull call to inferTransitiveBindings() out of BindingSet::finalize()

Author: slavapestov

include/swift/Sema/CSBindings.h

@@ -565,7 +565,7 @@ class BindingSet {
   ///
   /// \returns true if finalization successful (which makes binding set viable),
   /// and false otherwise.
-  bool finalize(bool transitive);
+  bool finalize();
 
   static BindingScore formBindingScore(const BindingSet &b);
 

lib/Sema/CSBindings.cpp

@@ -699,10 +699,7 @@ static Type getKeyPathType(ASTContext &ctx, KeyPathCapability capability,
   return keyPathTy;
 }
 
-bool BindingSet::finalize(bool transitive) {
-  if (transitive)
-    inferTransitiveBindings();
-
+bool BindingSet::finalize() {
   if (auto *locator = TypeVar->getImpl().getLocator()) {
     if (TypeVar->getImpl().isKeyPathType()) {
       auto &ctx = CS.getASTContext();
@@ -1195,7 +1192,9 @@ std::optional<BindingSet> ConstraintSystem::determineBestBindings(
     // produce a default type.
     bool isViable = isViableForRanking(bindings);
 
-    if (!bindings.finalize(true))
+    bindings.inferTransitiveBindings();
+
+    if (!bindings.finalize())
       continue;
 
     bindings.determineLiteralCoverage();
@@ -1596,7 +1595,7 @@ BindingSet ConstraintSystem::getBindingsFor(TypeVariableType *typeVar) {
   assert(!typeVar->getImpl().getFixedType(nullptr) && "has a fixed type");
 
   BindingSet bindings(*this, typeVar, CG[typeVar].getPotentialBindings());
-  bindings.finalize(false);
+  bindings.finalize();
   bindings.determineLiteralCoverage();
 
   return bindings;

unittests/Sema/BindingInferenceTests.cpp

@@ -125,7 +125,8 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
 
     cs.getConstraintGraph()[floatLiteralTy].initBindingSet();
 
-    bindings.finalize(/*transitive=*/true);
+    bindings.inferTransitiveBindings();
+    bindings.finalize();
     bindings.determineLiteralCoverage();
 
     // Inferred a single transitive binding through `$T_float`.

unittests/Sema/SemaFixture.cpp

@@ -141,7 +141,8 @@ BindingSet SemaTest::inferBindings(ConstraintSystem &cs,
 
     auto &bindings = node.getBindingSet();
     bindings.inferTransitiveProtocolRequirements();
-    bindings.finalize(/*transitive=*/true);
+    bindings.inferTransitiveBindings();
+    bindings.finalize();
     bindings.determineLiteralCoverage();
   }