[MacrosOnImports][Swiftify] Copy module imports from clang node's module to its Swift macro SourceFile #81859
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
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
5539cec to
7d2431e
Compare
hnrklssn
requested review from
Xazax-hun,
beccadax,
egorzhdan,
fahadnayyar,
hborla,
ian-twilightcoder,
j-hui,
slavapestov,
susmonteiro,
xedin and
zoecarver
as code owners
Member
Author
|
@swift-ci please smoke test |
hnrklssn
commented
Jun 4, 2025
Member
Author
There was a problem hiding this comment.
@DougGregor I don't fully get why only the module's imports that themselves are top-level modules show up in the dump. It seems to work regardless, but it seems a bit off. Do you know if this is intended?
Member
Author
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
7d2431e to
e5c5c6e
Compare
Member
Author
|
@swift-ci please smoke test |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
e5c5c6e to
229280f
Compare
Member
Author
|
@swift-ci please smoke test |
Member
Author
|
@swift-ci please smoke test windows |
Member
Author
|
@swift-ci please smoke test |
Xazax-hun
reviewed
Jun 5, 2025
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
1b8ba84 to
7c794aa
Compare
Member
Author
|
@swift-ci please smoke test macos |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
7c794aa to
726d7b3
Compare
Member
Author
|
@swift-ci please smoke test macos |
Member
Author
|
@swift-ci please smoke test |
2 similar comments
Member
Author
|
@swift-ci please smoke test |
Member
Author
|
@swift-ci please smoke test |
This flag dumps all imports for each SourceFile after it's gone through import resolution. It is only intended for testing purposes. There are other ways to print imports, but they don't correspond 1:1 to the imports actually resolved, which is a bit problematic when testing implicit clang module imports.
This prints all imports instead of just exported imports, for testing purposes.
The imported top-level module inherits the imports of all its (transitive) submodules. Since multiple submodules can import the same modules these need to be deduplicated to avoid redundant work.
Since only top-level Swift modules ever contain code, setting imports for submodule wrappers has no effect.
Non-explicit submodules don't need to be explicitly added to the list of imports to be visible, since their decls are implicitly exported. Skip these modules even when present in the list of imports. Explicit submodules are imported *regardless* of whether another module imports them however.
Importing clang submodules results in an implicit import of the top-level module as well. This can result in the same TLM being imported many different times, if multiple submodules are imported from the same module. This deduplicates these imports. Other imports are not expected to be duplicated, so care is taken to only deduplicate clang TLM imports.
Import resolution now adds the Swift module to the list of imports, so we no longer need to add it manually.
There's only one caller to performImportResolutionForClangMacroBuffer, which always passes a newly allocated SourceFile. This removes a redundant check for whether its imports have been resolved, and instead asserts that they haven't.
This fixes a few tests that were failing because scoped imports were counted as having imported the module already, leading to later imports of the same module being skipped. Since the scoped imports don't import the full module, this would result in syntactically imported symbols not being found by the compiler.
Contents in namespaces are imported to the bridging header module `__ObjC`. When macros attached to a decl imported from a namespace are expanded, they also end up in `__ObjC`. This prevents them from inheriting imports from the module they originated in. This patch implements a workaround by adding an alternative constructor to `ImportResolver` that takes an explicit origin module as input, overriding which module counts as the "parent" module.
A previous commit resulted in the swift interface for CxxStdlib containing an `import CxxStdlib` for each submodule. This restores the submodule names to `CxxStdlib.vector` etc.
libc++ v17-19 was split into multiple top-level modules, while versions earlier and later had one TLM with submodules.
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
c72dae7 to
0276feb
Compare
Member
Author
|
@swift-ci please smoke test |
Member
Author
|
@swift-ci please smoke test linux |
Member
Author
|
@swift-ci please smoke test linux macos |
Member
Author
|
@swift-ci please smoke test |
1 similar comment
Member
Author
|
@swift-ci please smoke test |
An assert checking the invariant of the module passed to alreadyImportedTLM being a top-level module would dereference a null pointer in the case where the clang module contained syntax errors, since findUnderlyingClangModule would return null. Instead call the bespoke isSubmodule function that already performs this null check. This fixes the lldb test lldb/test/API/lang/swift/clangimporter/expr_import/TestSwiftExprImport.py.
Member
Author
|
@swift-ci please smoke test |
Collaborator
|
This seems to have broken rebranch: https://ci.swift.org/view/Swift%20rebranch/job/oss-swift-rebranch-incremental-RA-macos/7016. Confirming in #81190. |
Collaborator
|
Confirmed reverting this PR makes the tests pass. |
hnrklssn
added a commit
that referenced
this pull request
Sep 23, 2025
[Interop] Fix tests relying on transitive module imports (NFC) This fixes test failures introduced by #81859 rdar://160994365
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.
Since the _SwiftifyImport peer macro expansion reuses the function signature of the original imported function, it needs to import the same modules as the module where the original clang node resides, to ensure visibility of any symbols that may appear in the signature.
rdar://151611573