averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CSRanking] Allow worse (score-wise) solutions to be removed by filtering

Browse Source 
The removed condition was incorrect because first of all it would
always be true since `losers` are populated with `false` based on
number of viable solutions and secondly it would result in a mix
of solutions with and without fixes.

Instead, in ambiguity cases, let's remove all of the solutions
that are worse than others based on score to avoid doing any
extra work in the future steps or during diagnostics.
This commit is contained in:
Pavel Yaskevich
2021-10-18 14:50:29 -07:00
parent 22aa3c5dbe
commit 1f7623d630
1 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Sema/CSRanking.cpp
View File

@@ -1368,8 +1368,14 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
// Find a potential best.
SmallVector<bool, 16> losers(viable.size(), false);
Score bestScore = viable.front().getFixedScore();
unsigned bestIdx = 0;
for (unsigned i = 1, n = viable.size(); i != n; ++i) {
auto currScore = viable[i].getFixedScore();
if (currScore < bestScore)
bestScore = currScore;
switch (compareSolutions(*this, viable, diff, i, bestIdx)) {
case SolutionCompareResult::Identical:
// FIXME: Might want to warn about this in debug builds, so we can
@@ -1424,52 +1430,14 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
return bestIdx;
}
// If there is not a single "better" than others
// solution, which probably means that solutions
// were incomparable, let's just keep the original
// list instead of removing everything, even if we
// are asked to "minimize" the result.
if (losers.size() == viable.size())
if (!minimize)
return None;
// The comparison was ambiguous. Identify any solutions that are worse than
// any other solution.
for (unsigned i = 0, n = viable.size(); i != n; ++i) {
// If the first solution has already lost once, don't bother looking
// further.
if (losers[i])
continue;
for (unsigned j = i + 1; j != n; ++j) {
// If the second solution has already lost once, don't bother looking
// further.
if (losers[j])
continue;
switch (compareSolutions(*this, viable, diff, i, j)) {
case SolutionCompareResult::Identical:
// FIXME: Dub one of these the loser arbitrarily?
break;
case SolutionCompareResult::Better:
losers[j] = true;
break;
case SolutionCompareResult::Worse:
losers[i] = true;
break;
case SolutionCompareResult::Incomparable:
break;
}
}
}
// Remove any solution that is worse than some other solution.
unsigned outIndex = 0;
for (unsigned i = 0, n = viable.size(); i != n; ++i) {
// Skip over the losing solutions.
if (losers[i])
if (viable[i].getFixedScore() > bestScore)
continue;
// If we have skipped any solutions, move this solution into the next
@@ -1479,6 +1447,7 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
++outIndex;
}
viable.erase(viable.begin() + outIndex, viable.end());
NumDiscardedSolutions += viable.size() - outIndex;