Merge pull request #15581 from apple/remove-narrow-perf-hack

xedin · web-flow · commit 4aad9322c1ad · 2018-03-29T00:22:19.000-07:00
[CSSolver] Remove tuple-to-tuple narrow perf hack
diff --git a/lib/Sema/CSSolver.cpp b/lib/Sema/CSSolver.cpp
@@ -1724,7 +1724,7 @@ static bool shortCircuitDisjunctionAt(Constraint *constraint,
 
     return true;
   }
-  
+
   // Anything without a fix is better than anything with a fix.
   if (constraint->getFix() && !successfulConstraint->getFix())
     return true;
@@ -1990,13 +1990,6 @@ bool ConstraintSystem::solveSimplified(
       }
 
       lastSolvedChoice = {currentChoice, *score};
-
-      // If we see a tuple-to-tuple conversion that succeeded, we're done.
-      // FIXME: This should be more general.
-      if (auto restriction = currentChoice->getRestriction()) {
-        if (*restriction == ConversionRestrictionKind::TupleToTuple)
-          break;
-      }
     }
 
     if (TC.getLangOpts().DebugConstraintSolver) {

Original file line number	Diff line number	Diff line change
`@@ -1724,7 +1724,7 @@ static bool shortCircuitDisjunctionAt(Constraint *constraint,`
`1724`	`1724`
`1725`	`1725`	`return true;`
`1726`	`1726`	`}`
`1727`		`-`
	`1727`	`+`
`1728`	`1728`	`// Anything without a fix is better than anything with a fix.`
`1729`	`1729`	`if (constraint->getFix() && !successfulConstraint->getFix())`
`1730`	`1730`	`return true;`
`@@ -1990,13 +1990,6 @@ bool ConstraintSystem::solveSimplified(`
`1990`	`1990`	`}`
`1991`	`1991`
`1992`	`1992`	`lastSolvedChoice = {currentChoice, *score};`
`1993`		`-`
`1994`		`- // If we see a tuple-to-tuple conversion that succeeded, we're done.`
`1995`		`- // FIXME: This should be more general.`
`1996`		`- if (auto restriction = currentChoice->getRestriction()) {`
`1997`		`- if (*restriction == ConversionRestrictionKind::TupleToTuple)`
`1998`		`- break;`
`1999`		`- }`
`2000`	`1993`	`}`
`2001`	`1994`
`2002`	`1995`	`if (TC.getLangOpts().DebugConstraintSolver) {`