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] Simplify diagnoseAmbiguityWithEphemeralPointers

Browse Source 
Don't attempt to figure out what exactly is ambiguous, let
`diagnoseAmbiguity` take care of that. Simplify make sure
that only some of the solutions have fixes and these fixes
are all related to use of ephemeral pointers.
This commit is contained in:
Pavel Yaskevich
2020-02-18 15:06:13 -08:00
parent d2953bb0c0
commit 2c92df4a6d
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Sema/ConstraintSystem.cpp
View File

@@ -2891,8 +2891,6 @@ static bool diagnoseConflictingGenericArguments(ConstraintSystem &cs,
static bool
diagnoseAmbiguityWithEphemeralPointers(ConstraintSystem &cs,
ArrayRef<Solution> solutions) {
llvm::MapVector<Expr *, ValueDecl *> ambiguities;
bool allSolutionsHaveFixes = true;
for (const auto &solution : solutions) {
if (solution.Fixes.empty()) {
@@ -2900,23 +2898,10 @@ diagnoseAmbiguityWithEphemeralPointers(ConstraintSystem &cs,
continue;
}
for (const auto *fix : solution.Fixes) {
if (fix->getKind() != FixKind::TreatEphemeralAsNonEphemeral)
return false;
// Ephemeral pointers are only possible in argument positions.
if (auto *anchor = simplifyLocatorToAnchor(fix->getLocator())) {
anchor = cast<InOutExpr>(anchor)->getSubExpr();
auto overload = solution.getOverloadChoiceIfAvailable(
cs.getConstraintLocator(anchor));
if (!(overload && overload->choice.isDecl()))
return false;
ambiguities.insert({anchor, overload->choice.getDecl()});
}
}
if (!llvm::all_of(solution.Fixes, [](const ConstraintFix *fix) {
return fix->getKind() == FixKind::TreatEphemeralAsNonEphemeral;
}))
return false;
}
// If all solutions have fixes for ephemeral pointers, let's
@@ -2924,13 +2909,10 @@ diagnoseAmbiguityWithEphemeralPointers(ConstraintSystem &cs,
if (allSolutionsHaveFixes)
return false;
auto &DE = cs.getASTContext().Diags;
for (const auto &entry : ambiguities) {
DE.diagnose(entry.first->getLoc(), diag::ambiguous_decl_ref,
DeclNameRef(entry.second->getBaseName()));
}
return true;
// If only some of the solutions have ephemeral pointer fixes
// let's let `diagnoseAmbiguity` diagnose the problem either
// with affected argument or related declaration e.g. function ref.
return cs.diagnoseAmbiguity(solutions);
}
bool ConstraintSystem::diagnoseAmbiguityWithFixes(