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

[Sema] Ignore individual FunctionArgument inout mismatch fix if there is already a fix recorded for function type locator

Browse Source
This commit is contained in:
LucianoAlmeida
2021-09-11 01:04:44 -03:00
parent 2ae2fee605
commit ac92f4e44a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Sema/CSSimplify.cpp
View File

@@ -4497,8 +4497,21 @@ bool ConstraintSystem::repairFailures(
break; break;
} }
auto *parentLoc = getConstraintLocator(anchor, path);
if ((lhs->is<InOutType>() && !rhs->is<InOutType>()) || if ((lhs->is<InOutType>() && !rhs->is<InOutType>()) ||
(!lhs->is<InOutType>() && rhs->is<InOutType>())) { (!lhs->is<InOutType>() && rhs->is<InOutType>())) {
// Since `FunctionArgument` as a last locator element represents
// a single parameter of the function type involved in a conversion
// to another function type, see `matchFunctionTypes`. If there is already
// a fix for the this convertion, we can just ignore individual function
// argument in-out mismatch failure by considered this fixed increasing
// the score.
if (hasFixFor(parentLoc)) {
increaseScore(SK_Fix);
return true;
}
// We want to call matchTypes with the default decomposition options // We want to call matchTypes with the default decomposition options
// in case there are type variables that we couldn't bind due to the // in case there are type variables that we couldn't bind due to the
// inout attribute mismatch. // inout attribute mismatch.
@@ -4514,7 +4527,6 @@ bool ConstraintSystem::repairFailures(
} }
} }
auto *parentLoc = getConstraintLocator(anchor, path);
// In cases like this `FunctionArgument` as a last locator element // In cases like this `FunctionArgument` as a last locator element
// represents a single parameter of the function type involved in // represents a single parameter of the function type involved in
// a conversion to another function type, see `matchFunctionTypes`. // a conversion to another function type, see `matchFunctionTypes`.