[5.1] [PropertyWrapper] Fix a bug with static property wrapper being rejected in a class #27212
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picking #27198. The first commit is new because we don't have TypeCheckStorage.cpp in the 5.1 branch. The second commit is from the original PR.
Explanation: We were rejecting the following valid code:
The problem here was that we were using the backing variable's static spelling, which is not present (because we haven't created its pattern binding at the time we access the spelling), so the check was falling down to calling
getCorrectStaticSpellingForDecl()
which returnedclass
as the spelling since the context is a class.We should be using the original variable's static spelling instead (we already use its static-ness to decide whether the backing variable should be static or not, might as well use its static spelling too).
Scope: Property wrapper usage inside a class
Issue: SR-11478
Testing: Swift CI
Risk: Low. This allows code that was previously rejected (incorrectly)
Reviewed by: @jrose-apple