[ClangImporter] Handle submodule imports in bridging headers #14487
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
This must have slipped in just before -typecheck was introduced, back when -parse did that instead of /only/ parsing.
If a bridging header imported a submodule but /not/ the top-level module, the top-level module would never be made visible. This is a problem since the Clang importer makes all top-level decls available through their enclosing top-level modules, not the individual submodules. To fix this, stop special-casing the way we handle bridging header imports; we can translate them from Clang Modules to Swift ModuleDecls the same way we do for regular imports. rdar://problem/37355259
jrose-apple
force-pushed
the
bridge-over-troubled-modules
branch
from
0156a16 to
6754cc6
Compare
|
The diff may be easier to read with whitespace changes ignored. @swift-ci Please test |
graydon
approved these changes
Feb 9, 2018
There was a problem hiding this comment.
If I understand correctly (and it's still .. pretty blurry) the key goal here is to route the bridging header imported modules into the non-bridging-header logic marked "HACK: Deal with imports of submodules" around line 3061? If so, seems ok to me; I wouldn't have guessed this in a million years, so thanks for dealing with it!
|
Yes, that's it. That code already handles submodules, and what we had before didn't, so just stop doing what we had before. |
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.
If a bridging header imported a submodule but not the top-level module, the top-level module would never be made visible. This is a problem since the Clang importer makes all top-level decls available through their enclosing top-level modules, not the individual submodules.
To fix this, stop special-casing the way we handle bridging header imports; we can translate them from Clang Modules to Swift ModuleDecls the same way we do for regular imports.
rdar://problem/37355259