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

[CSStep] Skip disabled overloads only if there are no fixes in diagnostic mode

Browse Source
This commit is contained in:
Pavel Yaskevich
2021-03-04 13:06:02 -08:00
parent cd08350fe5
commit 39b2ff92b3
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/CSStep.cpp
View File

@@ -598,10 +598,6 @@ bool TypeChecker::isDeclRefinementOf(ValueDecl *declA, ValueDecl *declB) {
bool DisjunctionStep::shouldSkip(const DisjunctionChoice &choice) const {
auto &ctx = CS.getASTContext();
// Never skip disjunction choices in diagnostic mode.
if (CS.shouldAttemptFixes())
return false;
auto skip = [&](std::string reason) -> bool {
if (CS.isDebugMode()) {
auto &log = getDebugLogger();
@@ -613,11 +609,14 @@ bool DisjunctionStep::shouldSkip(const DisjunctionChoice &choice) const {
return true;
};
if (choice.isDisabled())
// Skip disabled overloads in the diagnostic mode if they do not have a
// fix attached to them e.g. overloads where labels didn't match up.
if (choice.isDisabled() && !(CS.shouldAttemptFixes() && choice.hasFix()))
return skip("disabled");
// Skip unavailable overloads.
if (choice.isUnavailable())
// Skip unavailable overloads (unless in dignostic mode).
if (choice.isUnavailable() && !CS.shouldAttemptFixes())
return skip("unavailable");
if (ctx.TypeCheckerOpts.DisableConstraintSolverPerformanceHacks)