Merge pull request #5559 from rudkx/clean-up-handling-favored-constraint

Author: swift-ci

lib/Sema/CSSolver.cpp

@@ -2277,13 +2277,6 @@ bool ConstraintSystem::solveSimplified(
       DisjunctionChoices.push_back({locator, index});
     }
 
-    // Determine whether we're handling a favored constraint in subsystem.
-    const bool willBeHandlingFavoredConstraint
-      = constraint->isFavored() || HandlingFavoredConstraint;
-    llvm::SaveAndRestore<bool> handlingFavoredConstraint(
-                                 HandlingFavoredConstraint,
-                                 willBeHandlingFavoredConstraint);
-
     // Simplify this term in the disjunction.
     switch (simplifyConstraint(*constraint)) {
     case SolutionKind::Error:

lib/Sema/ConstraintSystem.h

@@ -893,10 +893,6 @@ class ConstraintSystem {
   /// solution it represents.
   Score CurrentScore;
 
-  /// Whether this constraint system is processing a favored
-  /// constraint.
-  bool HandlingFavoredConstraint = false;
-
   SmallVector<TypeVariableType *, 16> TypeVariables;
 
   /// Maps expressions to types for choosing a favored overload