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

Move all shouldRecordFix logic back into CS itself keying off of FixKind.

Browse Source
This commit is contained in:
gregomni
2018-08-25 11:40:28 -07:00
parent 821f63fe98
commit 31ca8db0f4
3 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/Sema/CSSimplify.cpp
View File

@@ -4987,6 +4987,15 @@ ConstraintSystem::simplifyRestrictedConstraint(
llvm_unreachable("Unhandled SolutionKind in switch.");
}
static bool isAugmentingFix(ConstraintFix *fix) {
switch (fix->getKind()) {
case swift::constraints::FixKind::TreatRValueAsLValue:
return false;
default:
return true;
}
}
bool ConstraintSystem::recordFix(ConstraintFix *fix) {
auto &ctx = getASTContext();
if (ctx.LangOpts.DebugConstraintSolver) {
@@ -5005,20 +5014,30 @@ bool ConstraintSystem::recordFix(ConstraintFix *fix) {
if (worseThanBestSolution())
return true;
if (!fix->shouldRecordFix())
return false;
auto *loc = fix->getLocator();
auto existingFix = llvm::find_if(Fixes, [&](const ConstraintFix *e) {
// If we already have a fix like this recorded, let's not do it again,
// this situation might happen when the same fix kind is applicable to
if (isAugmentingFix(fix)) {
// Always useful, unless duplicate of exactly the same fix and location.
// This situation might happen when the same fix kind is applicable to
// different overload choices.
return e->getKind() == fix->getKind() && e->getLocator() == loc;
});
if (existingFix == Fixes.end())
Fixes.push_back(fix);
auto *loc = fix->getLocator();
auto existingFix = llvm::find_if(Fixes, [&](const ConstraintFix *e) {
// If we already have a fix like this recorded, let's not do it again,
return e->getKind() == fix->getKind() && e->getLocator() == loc;
});
if (existingFix == Fixes.end())
Fixes.push_back(fix);
} else {
// Only useful to record if no pre-existing fix in the subexpr tree.
llvm::SmallDenseSet<Expr *> fixExprs;
for (auto fix : Fixes)
fixExprs.insert(fix->getAnchor());
bool found = false;
fix->getAnchor()->forEachChildExpr([&](Expr *subExpr) -> Expr * {
found |= fixExprs.count(subExpr) > 0;
return subExpr;
});
if (!found)
Fixes.push_back(fix);
}
return false;
}