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

Author: slavapestov

include/swift/Sema/CSBindings.h

@@ -556,6 +556,10 @@ class BindingSet {
   /// requirements down the subtype or equivalence chain.
   void inferTransitiveProtocolRequirements();
 
+  /// Check whether the given binding set covers any of the
+  /// literal protocols associated with this type variable.
+  void determineLiteralCoverage();
+
   /// Finalize binding computation for this type variable by
   /// inferring bindings from context e.g. transitive bindings.
   ///
@@ -586,10 +590,6 @@ class BindingSet {
 
   void addDefault(Constraint *constraint);
 
-  /// Check whether the given binding set covers any of the
-  /// literal protocols associated with this type variable.
-  void determineLiteralCoverage();
-
   StringRef getLiteralBindingKind(LiteralBindingKind K) const {
 #define ENTRY(Kind, String)                                                    \
   case LiteralBindingKind::Kind:                                               \

lib/Sema/CSBindings.cpp

@@ -668,8 +668,6 @@ bool BindingSet::finalize(bool transitive) {
   if (transitive)
     inferTransitiveBindings();
 
-  determineLiteralCoverage();
-
   if (auto *locator = TypeVar->getImpl().getLocator()) {
     if (locator->isLastElement<LocatorPathElt::MemberRefBase>()) {
       // If this is a base of an unresolved member chain, as a last
@@ -1198,6 +1196,8 @@ std::optional<BindingSet> ConstraintSystem::determineBestBindings(
     if (!bindings.finalize(true))
       continue;
 
+    bindings.determineLiteralCoverage();
+
     if (!bindings.hasViableBindings() && !bindings.isDirectHole())
       continue;
 
@@ -1595,6 +1595,7 @@ BindingSet ConstraintSystem::getBindingsFor(TypeVariableType *typeVar) {
 
   BindingSet bindings(*this, typeVar, CG[typeVar].getPotentialBindings());
   bindings.finalize(false);
+  bindings.determineLiteralCoverage();
 
   return bindings;
 }

unittests/Sema/BindingInferenceTests.cpp

@@ -126,6 +126,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
     cs.getConstraintGraph()[floatLiteralTy].initBindingSet();
 
     bindings.finalize(/*transitive=*/true);
+    bindings.determineLiteralCoverage();
 
     // Inferred a single transitive binding through `$T_float`.
     ASSERT_EQ(bindings.Bindings.size(), (unsigned)1);

unittests/Sema/SemaFixture.cpp

@@ -142,6 +142,7 @@ BindingSet SemaTest::inferBindings(ConstraintSystem &cs,
     auto &bindings = node.getBindingSet();
     bindings.inferTransitiveProtocolRequirements();
     bindings.finalize(/*transitive=*/true);
+    bindings.determineLiteralCoverage();
   }
 
   auto &node = cs.getConstraintGraph()[typeVar];