mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
[ConstraintSystem] Fix non-determinism in diagnoseAmbiguity
Simplification of member locator would produce a base expression,
this is what we want for diagnostics but not for comparisons in
`diagnoseAmbiguity` because base expression is located at a different
depth which would lead to incorrect results if both reference and base
expression are ambiguous e.g. `test[x].count` if both `[x]` and `count`
are ambiguous than simplification of `count` would produce `[x]` which
is incorrect.
This is the test-case (already in the suite) that exibits this behavior:
```
func test_ambiguity_with_placeholders(pairs: [(rank: Int, count: Int)]) -> Bool {
return pairs[<#^ARG^#>].count == 2
}
```
Here subscript would either return a tuple or `ArraySlice` and
`count` is ambiguous because both have it.
This commit is contained in:
@@ -4230,10 +4230,25 @@ bool ConstraintSystem::diagnoseAmbiguity(ArrayRef<Solution> solutions) {
|
||||
|
||||
for (unsigned i = 0, n = diff.overloads.size(); i != n; ++i) {
|
||||
auto &overload = diff.overloads[i];
|
||||
auto *locator = overload.locator;
|
||||
|
||||
Expr *anchor = nullptr;
|
||||
|
||||
// Simplification of member locator would produce a base expression,
|
||||
// this is what we want for diagnostics but not for comparisons here
|
||||
// because base expression is located at a different depth which would
|
||||
// lead to incorrect results if both reference and base expression are
|
||||
// ambiguous e.g. `test[x].count` if both `[x]` and `count` are ambiguous
|
||||
// than simplification of `count` would produce `[x]` which is incorrect.
|
||||
if (locator->isLastElement<LocatorPathElt::Member>() ||
|
||||
locator->isLastElement<LocatorPathElt::ConstructorMember>()) {
|
||||
anchor = getAsExpr(locator->getAnchor());
|
||||
} else {
|
||||
anchor = getAsExpr(simplifyLocatorToAnchor(overload.locator));
|
||||
}
|
||||
|
||||
// If we can't resolve the locator to an anchor expression with no path,
|
||||
// we can't diagnose this well.
|
||||
auto *anchor = getAsExpr(simplifyLocatorToAnchor(overload.locator));
|
||||
if (!anchor)
|
||||
continue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user