Sema: Fix a MemberImportVisibility regression in resolveDeclRefExpr()
#84659
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
|
@swift-ci please test |
tshortli
commented
Oct 2, 2025
| if (result) | ||
| return result; | ||
|
|
||
| // We didn't find any results. Look for common mistakes to diagnose. |
There was a problem hiding this comment.
All of the code below this point just moved but is otherwise unchanged.
xedin
approved these changes
Oct 2, 2025
|
@swift-ci please test Linux |
tshortli
force-pushed
the
member-import-visibility-resolve-decl-ref-expr-fix
branch
from
436eebe to
4773afa
Compare
|
@swift-ci please test |
tshortli
force-pushed
the
member-import-visibility-resolve-decl-ref-expr-fix
branch
from
9bc1f44 to
168f36a
Compare
|
@swift-ci please test |
The changes from swiftlang#84259 caused a regression in which declarations from an outer scope could be shadowed inappropriately by member declarations from a module that has not been imported. This fix addresses the issue by refactoring `resolveDeclRefExpr()` so that it performs lookups in two passes. First, it attempts to resolve the decl ref using the complete lookup algorithm and standard name lookup options, which will ignore members from modules that haven't been imported if `MemberImportVisibility` is enabled. Then, if no results were found it re-runs the full lookup algorithm again with `NameLookupFlags::IgnoreMissingImports` included to find additional results that ought to be diagnosed as unavailable. This insures that the unavailable results are not considered until after the main lookup has already failed. Resolves rdar://161078015.
tshortli
force-pushed
the
member-import-visibility-resolve-decl-ref-expr-fix
branch
from
168f36a to
8053120
Compare
|
@swift-ci please smoke test |
tshortli
deleted the
member-import-visibility-resolve-decl-ref-expr-fix
branch
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.
The changes from #84259 caused a regression in which declarations from an outer scope could be shadowed inappropriately by member declarations from a module that has not been imported. This fix addresses the issue by refactoring
resolveDeclRefExpr()so that it performs lookups in two passes. First, it attempts to resolve the decl ref using the complete lookup algorithm and standard name lookup options, which will ignore members from modules that haven't been imported ifMemberImportVisibilityis enabled. Then, if no results were found it re-runs the full lookup algorithm again withNameLookupFlags::IgnoreMissingImportsincluded to find additional results that ought to be diagnosed as unavailable. This insures that the unavailable results are not considered until after the main lookup has already failed.Resolves rdar://161078015.