Sema: Fix a crash in migrate mode for MemberImportVisibility
#84259
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
tshortli
force-pushed
the
member-import-visibility-migrate-crash
branch
2 times, most recently
from
a1960ea to
d3f1868
Compare
tshortli
requested review from
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci please test source compatibility debug |
|
@swift-ci please test Linux |
`TypeChecker::resolveDeclRefExpr()` would leave error nodes in the AST when performing fallback name lookups with `MemberImportVisibility`. When running in migration mode for `MemberImportVisibility`, these error nodes would then cause the compiler to either diagnose a missing error or to crash during SILGen. Instead of restricting name lookup during `TypeChecker::resolveDeclRefExpr()`, allow it to find candidates with missing imports and then diagnose them if necessary before forming a resolve decl ref. Resolves rdar://154361861.
tshortli
force-pushed
the
member-import-visibility-migrate-crash
branch
from
d3f1868 to
d8fac32
Compare
|
@swift-ci please test |
|
swiftlang/swift-foundation#1510 @swift-ci please test |
|
swiftlang/swift-foundation#1512 @swift-ci please test Windows |
tshortli
added a commit
to tshortli/swift
that referenced
this pull request
Oct 2, 2025
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
added a commit
to tshortli/swift
that referenced
this pull request
Oct 3, 2025
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
added a commit
to tshortli/swift
that referenced
this pull request
Oct 4, 2025
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.
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.
TypeChecker::resolveDeclRefExpr()would leave error nodes in the AST when performing fallback name lookups withMemberImportVisibility. When running in migration mode forMemberImportVisibility, these error nodes would then cause the compiler to either diagnose a missing error or to crash during SILGen.Instead of restricting name lookup during
TypeChecker::resolveDeclRefExpr(), allow it to find candidates with missing imports and then diagnose them if necessary before forming a resolve decl ref.Resolves rdar://154361861.