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] Pass decl to diagnostic instead of trying to validate loc

Browse Source 
`DiagnosticEngine` does the checking for declaration, so all we
need to do for ambiguity diagnostic is to use an overload declaration.
This commit is contained in:
Pavel Yaskevich
2022-07-25 11:05:37 -07:00
parent 399d3490d4
commit c300edb6ee
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/ConstraintSystem.cpp
View File

@@ -4270,22 +4270,18 @@ static bool diagnoseAmbiguityWithContextualType(
for (const auto &solution : solutions) {
auto overload = solution.getOverloadChoice(calleeLocator);
if (auto *decl = overload.choice.getDeclOrNull()) {
auto loc = decl->getLoc();
if (loc.isInvalid())
continue;
auto type = solution.simplifyType(overload.boundType);
if (isExpr<ApplyExpr>(anchor) || isExpr<SubscriptExpr>(anchor)) {
auto fnType = type->castTo<FunctionType>();
DE.diagnose(
loc,
decl,
contextualTy->is<ProtocolType>()
? diag::overload_result_type_does_not_conform
: diag::cannot_convert_candidate_result_to_contextual_type,
decl->getName(), fnType->getResult(), contextualTy);
} else {
DE.diagnose(loc, diag::found_candidate_type, type);
DE.diagnose(decl, diag::found_candidate_type, type);
}
}
}