Requestify scoped import validation #30038
Merged
Conversation
This file contains 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 |
This can be used to retrieve the Swift module wrapper for a Clang submodule's top-level module.
hamishknight
force-pushed
the
plenty-of-scope-for-requestification
branch
from
188b99e
to
97837c1
Compare
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
CodaFi
reviewed
Feb 25, 2020
CodaFi
approved these changes
Feb 25, 2020
hamishknight
force-pushed
the
plenty-of-scope-for-requestification
branch
from
97837c1
to
586559c
Compare
|
@swift-ci please test Windows platform |
|
@compnerd Mind triggering again? |
Move the validation of scoped imports into a request, and force the request when we're type-checking a primary file. This has the nice bonus of no longer running the validation for secondary files. The use of `ModuleDecl::getTopLevelModule` also allows us to correctly retrieve the top-level module for a Clang submodule, rather than potentially retrieving the Swift module in a mixed source project. Resolves SR-12265.
This was only required to represent an import that hadn't yet had its scope validated. Now that the validation has been requestified, we can directly record the resulting `ImportedModuleDesc` instead.
hamishknight
force-pushed
the
plenty-of-scope-for-requestification
branch
from
586559c
to
0c785aa
Compare
|
@swift-ci please smoke test |
|
@swift-ci please test Windows platform |
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.
Move the lookup and validation of scoped imports into a request, and force the request when we're type-checking a primary file. This avoids having to do an additional pass during name binding, and has the nice bonus of no longer running the validation for secondary files.
This PR also adds
ModuleDecl::getTopLevelModule, and uses it for the lookup of the scoped import rather than attempting to retrieve a module with the same name as the top-level module. This allows us to correctly retrieve the top-level module for a Clang submodule, rather than potentially retrieving the Swift module in a mixed source project.Resolves SR-12265.