[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
zoecarver,
egorzhdan,
Xazax-hun,
j-hui,
fahadnayyar,
susmonteiro,
hborla,
slavapestov,
xedin,
beccadax and
ian-twilightcoder
as code owners
|
@swift-ci please smoke test |
hnrklssn
commented
Jun 4, 2025
|
|
||
| // CHECK: import ModuleA | ||
| // CHECK-NEXT: import ModuleB | ||
| // CHECK-NOT: import |
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?
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
7d2431e to
e5c5c6e
Compare
|
@swift-ci please smoke test |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
e5c5c6e to
229280f
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test windows |
|
@swift-ci please smoke test |
Xazax-hun
reviewed
Jun 5, 2025
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
1b8ba84 to
7c794aa
Compare
|
@swift-ci please smoke test macos |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
7c794aa to
726d7b3
Compare
|
@swift-ci please smoke test macos |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
726d7b3 to
b3c5489
Compare
|
@swift-ci please smoke test macos |
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Jun 11, 2025
This assert was reportedly added to "Defensively ensure that GetExternalDeclStmt protects itself from nested deserialization". Given that this triggers without nested deserialization we should remove this assert. The assert blocks swiftlang/swift#81859 rdar://153085264
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Jun 11, 2025
This assert was reportedly added to "Defensively ensure that GetExternalDeclStmt protects itself from nested deserialization". Given that this triggers without nested deserialization we should remove this assert. The assert blocks swiftlang/swift#81859 rdar://153085264
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
b3c5489 to
c01392c
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
When macros like _SwiftifyImport are added to a wrapper module for a clang module, they may need to refer to symbols declared in another clang module that the wrapped module imports (e.g. because they are used in the original signature). This adds all the imported clang modules as implicit imports to the wrapper module. rdar://151611573
hnrklssn
force-pushed
the
swiftify-inherit-imports
branch
from
c01392c to
b2084b2
Compare
|
@swift-ci please smoke test |
|
swiftlang/llvm-project#10957 |
|
swiftlang/llvm-project@ffa75c8 @swift-ci please smoke test |
|
swiftlang/llvm-project#11022 |
Decls in Swift wrapper module may not originate in the top-level clang module with the same name, since decls in clang submodules are dumped into the top-level module. This is because Swift has no concept of submodules. To make sure that any imported decl has access to the same symbols as the original clang decl had, all transitive submodules, and their imports, are added as implicit imports of the wrapper module. This is necessary in the case where a submodule is marked `explicit`. The content in explicit submodules isn't normally made visible when importing the parent module. Decls from explicit submodules still end up in the top-level wrapper module however, so in Swift they do still need to be visible from the top-level module. This is relevant for macro expansions, so that they can refer to the same types as the original decl.
|
swiftlang/llvm-project#11022 |
DougGregor
approved these changes
Jul 28, 2025
| llvm::SmallVector<const clang::Module *, 32> SubmoduleWorklist; | ||
| SubmoduleWorklist.push_back(underlying); | ||
| while (!SubmoduleWorklist.empty()) { | ||
| const clang::Module *CurrModule = SubmoduleWorklist.pop_back_val(); |
There was a problem hiding this comment.
Can you put in a set of already-visited modules so we don't re-explore the same subgraph many times?
| I->getFullModuleName(); | ||
| ImportPath::Builder importPath(SwiftContext, swiftModuleName, '.'); | ||
| UnloadedImportedModule importedModule(importPath.copyTo(SwiftContext), ImportKind::Module); | ||
| implicitImportInfo.AdditionalUnloadedImports.push_back(importedModule); |
There was a problem hiding this comment.
Can we restrict ourselves to only recording the explicit submodules we find rather than recording every submodule we find?
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