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

[CSSimplify] Add checks for invalid keypath member refs

Browse Source
This commit is contained in:
Amritpan Kaur
2023-08-17 19:04:16 -07:00
parent 37b9a695a2
commit 71a94a859b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/CSSimplify.cpp
View File

@@ -10332,7 +10332,9 @@ static ConstraintFix *fixMemberRef(
return fix;
}
if (locator->isForKeyPathDynamicMemberLookup()) {
if (locator->isForKeyPathDynamicMemberLookup() ||
locator->isForKeyPathComponent() ||
locator->isKeyPathSubscriptComponent()) {
if (auto *fix = AllowInvalidRefInKeyPath::forRef(cs, decl, locator))
return fix;
}
@@ -12303,11 +12305,9 @@ ConstraintSystem::simplifyKeyPathConstraint(
auto storage = dyn_cast<AbstractStorageDecl>(choice.getDecl());
if (auto *fix = AllowInvalidRefInKeyPath::forRef(
*this, choice.getDecl(), calleeLoc)) {
if (!hasFixFor(calleeLoc, FixKind::AllowTypeOrInstanceMember))
if (!shouldAttemptFixes() || recordFix(fix))
return SolutionKind::Error;
if (hasFixFor(calleeLoc, FixKind::AllowInvalidRefInKeyPath)) {
if (!shouldAttemptFixes())
return SolutionKind::Error;
// If this was a method reference let's mark it as read-only.
if (!storage) {