[CSBindings] Fix merge conflicts with main

Author: xedin

include/swift/Sema/CSBindings.h

@@ -417,8 +417,6 @@ class BindingSet {
            !Defaults.empty();
   }
 
-  LiteralBindingKind getLiteralKind() const;
-
   ArrayRef<Constraint *> getConformanceRequirements() const {
     return Info.Protocols;
   }
@@ -459,33 +457,10 @@ class BindingSet {
 
   LiteralBindingKind getLiteralKind() const;
 
-  void addDefault(Constraint *constraint);
-
-  void addLiteral(Constraint *constraint);
-
-  /// Add a potential binding to the list of bindings,
-  /// coalescing supertype bounds when we are able to compute the meet.
-  void addPotentialBinding(PotentialBinding binding, bool allowJoinMeet = true);
-
-  /// Check if this binding is viable for inclusion in the set.
-  bool isViable(PotentialBinding &binding) const;
-
-  bool isGenericParameter() const;
-
-  bool isSubtypeOf(TypeVariableType *typeVar) const {
-    auto result = SubtypeOf.find(typeVar);
-    if (result == SubtypeOf.end())
-      return false;
-
-    auto *constraint = result->second;
-    return constraint->getKind() == ConstraintKind::Subtype;
-  }
-
   /// Check if this binding is favored over a disjunction e.g.
   /// if it has only concrete types or would resolve a closure.
   bool favoredOverDisjunction(Constraint *disjunction) const;
 
-private:
   /// Detect `subtype` relationship between two type variables and
   /// attempt to infer supertype bindings transitively e.g.
   ///
@@ -510,10 +485,6 @@ class BindingSet {
   void finalize(
       llvm::SmallDenseMap<TypeVariableType *, BindingSet> &inferredBindings);
 
-  /// Check if this binding is favored over a disjunction e.g.
-  /// if it has only concrete types or would resolve a closure.
-  bool favoredOverDisjunction(Constraint *disjunction) const;
-
   static BindingScore formBindingScore(const BindingSet &b);
 
   /// Compare two sets of bindings, where \c x < y indicates that

lib/Sema/CSBindings.cpp

@@ -579,7 +579,7 @@ void BindingSet::determineLiteralCoverage() {
       }
 
       std::tie(isCovered, adjustedTy) =
-          literalInfo.isCoveredBy(*binding, CS.DC, allowsNil);
+          literalInfo.isCoveredBy(*binding, allowsNil, CS.DC);
 
       if (isCovered) {
         literalInfo.setCoveredBy(binding->getSource());