[6.2] Serialization: Apply type-checking shadowing after deserialization filtering #80656
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Followup fix to swiftlang#80009. We can still get ambiguities from colliding decls across modules with the deserialization filtering. Bring back calling the general lookup shadowing after the filtering. This way it won't use filtered out decls to hide potential candidates. rdar://148286345
|
@swift-ci Please test |
xymus
changed the title
nkcsgexi
approved these changes
Apr 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follow up to #80009. We can still get ambiguities from colliding decls across modules with only the deserialization filtering. Call the general lookup shadowing after the deserialization filtering, instead of before as it used to be done. This way it won't use filtered out decls to hide potential candidates and still avoid ambiguities.
Reviewed by: @tshortli
Resolves: rdar://148286345
Cherry-pick of #80550
Risk: Low, this is in effect a partial revert of #80009. It applies only when deserialization lookup finds two decls corresponding to the same criteria.