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

[ConstraintSystem] Split unviable lookup result storage into candidates & reasons

Browse Source 
That makes it easy to process unviable choices the same way as viable
ones and request rejection reasons only when necessary.
This commit is contained in:
Pavel Yaskevich
2019-03-14 22:20:17 -07:00
parent ce2fe021bf
commit 852169a5f5
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Sema/CSSimplify.cpp
View File

@@ -3933,10 +3933,10 @@ retry_after_fail:
result.addViable(
OverloadChoice::getDynamicMemberLookup(baseTy, decl, name));
}
for (auto candidate : subscripts.UnviableCandidates) {
auto decl = candidate.first.getDecl();
for (auto index : indices(subscripts.UnviableCandidates)) {
auto decl = subscripts.UnviableCandidates[index].getDecl();
auto choice = OverloadChoice::getDynamicMemberLookup(baseTy, decl,name);
result.addUnviable(choice, candidate.second);
result.addUnviable(choice, subscripts.UnviableReasons[index]);
}
}
}
@@ -4232,21 +4232,15 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
}
if (!result.UnviableCandidates.empty()) {
SmallVector<OverloadChoice, 8> choices;
llvm::transform(
result.UnviableCandidates, std::back_inserter(choices),
[](const std::pair<OverloadChoice, MemberLookupResult::UnviableReason>
&candidate) { return candidate.first; });
// Generate constraints for unvailable choices if they have a fix,
// and disable them by default, they'd get picked up in the "salvage" mode.
generateConstraints(candidates, memberTy, choices, useDC, locator,
/*favoredChoice=*/None, /*requiresFix=*/true,
[&](unsigned idx, const OverloadChoice &choice) {
return fixMemberRef(
*this, baseTy, member, choice, locator,
result.UnviableCandidates[idx].second);
});
generateConstraints(
candidates, memberTy, result.UnviableCandidates, useDC, locator,
/*favoredChoice=*/None, /*requiresFix=*/true,
[&](unsigned idx, const OverloadChoice &choice) {
return fixMemberRef(*this, baseTy, member, choice, locator,
result.UnviableReasons[idx]);
});
}
if (!candidates.empty()) {