Merge pull request swiftlang#19749 from rudkx/fix-short-circuiting

[ConstraintSystem] Tweak -disable-constraint-solver-performance-hacks.

Author: rudkx

lib/Sema/CSStep.cpp

@@ -493,8 +493,6 @@ bool DisjunctionStep::shouldStopAt(const DisjunctionChoice &choice) const {
 bool DisjunctionStep::shortCircuitDisjunctionAt(
     Constraint *currentChoice, Constraint *lastSuccessfulChoice) const {
   auto &ctx = CS.getASTContext();
-  if (ctx.LangOpts.DisableConstraintSolverPerformanceHacks)
-    return false;
 
   // If the successfully applied constraint is favored, we'll consider that to
   // be the "best".
@@ -515,6 +513,9 @@ bool DisjunctionStep::shortCircuitDisjunctionAt(
   if (currentChoice->getFix() && !lastSuccessfulChoice->getFix())
     return true;
 
+  if (ctx.LangOpts.DisableConstraintSolverPerformanceHacks)
+    return false;
+
   if (auto restriction = currentChoice->getRestriction()) {
     // Non-optional conversions are better than optional-to-optional
     // conversions.