[NFC] Miscellaneous Cleanups To Clang Module Loading #32145
Merged
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
It's a touch cleaner to do this than passing around a pile of bools.
The only caller consuming the data that resulted from this bit has it set to false. Additionally, the side effect of force-loading the overlays is already handled unconditionally by the call to namelookup::getAllImports.
Contributor
Author
|
@swift-ci test |
Contributor
Author
|
@swift-ci test source compatibility |
Contributor
Author
|
@swift-ci test source compatibility release |
Contributor
|
Build failed |
Contributor
Author
|
Ah, the joys of non-deterministic diagnostics @swift-ci test macOS platform |
Contributor
|
Build failed |
Contributor
Author
|
@swift-ci clean test macOS platform |
Contributor
|
Build failed |
Contributor
Author
|
Fech, everything fell over. @swift-ci clean smoke test |
Contributor
Author
|
@swift-ci test source compatibility |
davidungar
approved these changes
Jun 3, 2020
Contributor
davidungar
left a comment
davidungar
left a comment
There was a problem hiding this comment.
Overall, looks nice and clean. I don't know enough to vouch for its correctness, though.
Comment on lines
-1809
to
-1840
| auto &cacheEntry = ModuleWrappers[clangModule]; | ||
| ModuleDecl *result; | ||
| ClangModuleUnit *wrapperUnit; | ||
| if ((wrapperUnit = cacheEntry.getPointer())) { | ||
| result = wrapperUnit->getParentModule(); | ||
| if (!cacheEntry.getInt()) { | ||
| // Force load overlays for all imported modules. | ||
| // FIXME: This forces the creation of wrapper modules for all imports as | ||
| // well, and may do unnecessary work. | ||
| cacheEntry.setInt(true); | ||
| (void) namelookup::getAllImports(result); | ||
| } | ||
| } else { | ||
| // Build the representation of the Clang module in Swift. | ||
| // FIXME: The name of this module could end up as a key in the ASTContext, | ||
| // but that's not correct for submodules. | ||
| Identifier name = SwiftContext.getIdentifier((*clangModule).Name); | ||
| result = ModuleDecl::create(name, SwiftContext); | ||
| result->setIsSystemModule(clangModule->IsSystem); | ||
| result->setIsNonSwiftModule(); | ||
| result->setHasResolvedImports(); | ||
|
|
||
| wrapperUnit = | ||
| new (SwiftContext) ClangModuleUnit(*result, *this, clangModule); | ||
| result->addFile(*wrapperUnit); | ||
| SwiftContext.getClangModuleLoader() | ||
| ->findOverlayFiles(importLoc, result, wrapperUnit); | ||
| cacheEntry.setPointerAndInt(wrapperUnit, true); | ||
|
|
||
| // Force load overlays for all imported modules. | ||
| // FIXME: This forces the creation of wrapper modules for all imports as | ||
| // well, and may do unnecessary work. |
Contributor
There was a problem hiding this comment.
Nice to rid of all this stuff. I don't know the ClangImporter well enough to understand how we can afford to get rid of it, but I'll take your word for it.
Contributor
Author
|
⛵ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
getWrapperForModulein clang module loading.