Sema: Fold Constraint::createFixedChoice() into Constraint::createBindOverload()

Author: slavapestov

include/swift/Sema/Constraint.h

@@ -558,10 +558,10 @@ class Constraint final : public llvm::ilist_node<Constraint>,
       ValueDecl *requirement, DeclContext *useDC,
       FunctionRefKind functionRefKind, ConstraintLocator *locator);
 
-  /// Create an overload-binding constraint.
+  /// Create an overload-binding constraint, possibly with a fix.
   static Constraint *createBindOverload(ConstraintSystem &cs, Type type, 
                                         OverloadChoice choice, 
-                                        DeclContext *useDC,
+                                        DeclContext *useDC, ConstraintFix *fix,
                                         ConstraintLocator *locator);
 
   /// Create a restricted relational constraint.
@@ -575,13 +575,6 @@ class Constraint final : public llvm::ilist_node<Constraint>,
                                  ConstraintFix *fix, Type first, Type second,
                                  ConstraintLocator *locator);
 
-  /// Create a bind overload choice with a fix.
-  /// Note: This constraint is going to be disabled by default.
-  static Constraint *createFixedChoice(ConstraintSystem &cs, Type type,
-                                       OverloadChoice choice,
-                                       DeclContext *useDC, ConstraintFix *fix,
-                                       ConstraintLocator *locator);
-
   /// Create a new disjunction constraint.
   static Constraint *createDisjunction(ConstraintSystem &cs,
                                        ArrayRef<Constraint *> constraints,

lib/Sema/Constraint.cpp

@@ -805,7 +805,8 @@ Constraint *Constraint::createMemberOrOuterDisjunction(
   memberConstraint->setFavored();
   for (auto choice : outerAlternatives) {
     constraints.push_back(
-        Constraint::createBindOverload(cs, first, choice, useDC, locator));
+        Constraint::createBindOverload(cs, first, choice, useDC, /*fix=*/nullptr,
+                                       locator));
   }
   return Constraint::createDisjunction(cs, constraints, locator, ForgetChoice);
 }
@@ -856,8 +857,22 @@ Constraint *Constraint::createValueWitness(
 Constraint *Constraint::createBindOverload(ConstraintSystem &cs, Type type, 
                                            OverloadChoice choice, 
                                            DeclContext *useDC,
+                                           ConstraintFix *fix,
                                            ConstraintLocator *locator) {
-  return createFixedChoice(cs, type, choice, useDC, /*fix=*/nullptr, locator);
+  // Collect type variables.
+  SmallPtrSet<TypeVariableType *, 4> typeVars;
+  if (type->hasTypeVariable())
+    type->getTypeVariables(typeVars);
+  if (auto baseType = choice.getBaseType()) {
+    baseType->getTypeVariables(typeVars);
+  }
+
+  // Create the constraint.
+  auto size =
+    totalSizeToAlloc<TypeVariableType *, ConstraintFix *, OverloadChoice>(
+      typeVars.size(), fix ? 1 : 0, /*hasOverloadChoice=*/1);
+  void *mem = cs.getAllocator().Allocate(size, alignof(Constraint));
+  return new (mem) Constraint(type, choice, useDC, fix, locator, typeVars);
 }
 
 Constraint *Constraint::createRestricted(ConstraintSystem &cs, 
@@ -899,27 +914,6 @@ Constraint *Constraint::createFixed(ConstraintSystem &cs, ConstraintKind kind,
   return new (mem) Constraint(kind, fix, first, second, locator, typeVars);
 }
 
-Constraint *Constraint::createFixedChoice(ConstraintSystem &cs, Type type,
-                                          OverloadChoice choice,
-                                          DeclContext *useDC,
-                                          ConstraintFix *fix,
-                                          ConstraintLocator *locator) {
-  // Collect type variables.
-  SmallPtrSet<TypeVariableType *, 4> typeVars;
-  if (type->hasTypeVariable())
-    type->getTypeVariables(typeVars);
-  if (auto baseType = choice.getBaseType()) {
-    baseType->getTypeVariables(typeVars);
-  }
-
-  // Create the constraint.
-  auto size =
-    totalSizeToAlloc<TypeVariableType *, ConstraintFix *, OverloadChoice>(
-      typeVars.size(), fix ? 1 : 0, /*hasOverloadChoice=*/1);
-  void *mem = cs.getAllocator().Allocate(size, alignof(Constraint));
-  return new (mem) Constraint(type, choice, useDC, fix, locator, typeVars);
-}
-
 Constraint *Constraint::createDisjunction(ConstraintSystem &cs,
                                           ArrayRef<Constraint *> constraints,
                                           ConstraintLocator *locator,

lib/Sema/ConstraintSystem.cpp

@@ -3831,10 +3831,8 @@ void ConstraintSystem::generateConstraints(
     if (requiresFix && !fix)
       return;
 
-    auto *choice = fix ? Constraint::createFixedChoice(*this, type, overload,
-                                                       useDC, fix, locator)
-                       : Constraint::createBindOverload(*this, type, overload,
-                                                        useDC, locator);
+    auto *choice = Constraint::createBindOverload(*this, type, overload,
+                                                  useDC, fix, locator);
 
     if (isFavored)
       choice->setFavored();