Implicit import fixes #84642
Open
Implicit import fixes #84642
+230
−16
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
requested review from
Xazax-hun,
beccadax,
egorzhdan,
fahadnayyar,
hborla,
ian-twilightcoder,
j-hui,
slavapestov,
susmonteiro,
xedin and
zoecarver
as code owners
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
Xazax-hun
reviewed
Oct 2, 2025
egorzhdan
reviewed
Oct 2, 2025
| ImportPath::Builder builder; | ||
| while (M) { | ||
| if (!M->isSubModule() && isCxxStdModule(M)) | ||
| if (!M->isSubModule() && M->Name == "std") |
There was a problem hiding this comment.
Should this still accept std_core, which acts as a top-level module in recent libc++?
There was a problem hiding this comment.
This is specifically done to exclude top-level libc++ modules other than std. The issue is that while you could specify submodules to CxxStdlib, there was no way to inherit imports to other libc++ submodules. E.g. a clang module importing std_core.math.abs would become an import of CxxStdlib.math.abs on the Swift side, which would then be translated back to std.math.abs (which doesn't exist) when looking up the module.
hnrklssn
force-pushed
the
implicit-import-fixes
branch
from
77e67bf to
25b189d
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
hnrklssn
force-pushed
the
implicit-import-fixes
branch
from
25b189d to
52a3df3
Compare
|
@swift-ci please smoke test |
hnrklssn
force-pushed
the
implicit-import-fixes
branch
from
52a3df3 to
851d5cc
Compare
hnrklssn
force-pushed
the
implicit-import-fixes
branch
from
9c1a8a9 to
58ca618
Compare
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
|
This is finally ready for review now |
Inheriting a clang import marked `requires: !swift` will always result in an error. This skips such imports, which *may* result in name lookup errors instead, but also may not, depending on the module. rdar://161795145
When expanding a Swift macro in a clang module where the original clang module imported a submodule in a C++ standard library module other than `std`, e.g. a submodule to `std_core`, this would result in an error. This is because `std_core.math.abs` would be imported as `CxxStdlib.math.abs`, which would later be translated back as `std.math.abs` which doesn’t exist. This changes the mapping to only map `std` to `CxxStdlib`. To prevent errors when importing modules starting with `std_`, this error is moved from the late-stage module import to the earlier processing of `ImportDecl`s. This results in these module names still being forbidden in explicit imports (i.e. naming them in source code), while still being allowed in implicit imports inherited from clang modules. This also fixes a fix-it bug where only the first 3 characters would be selected for replacing with `CxxStdlib` when importing `std_core`. This also fixes a diagnostic bug where aliased modules would refer to the module name in the source code rather than the real module name, and adds a note clarifying the situation. rdar://161795429 rdar://161795673 rdar://161795793
The _SwiftifyImport macro is emitted into an unnamed buffer and then parsed, pretending it was in the header all along. This makes it hard to add `expected-note` comments for `diag::in_macro_expansion` when they point here. That's okay, because the macro expansion has already been pointed out by `expected-expansion` directives. But -verify-ignore-unrelated is too blunt of a tool, so this adds -verify-ignore-macro-note to ignore these specific diagnostics.
hnrklssn
force-pushed
the
implicit-import-fixes
branch
from
7656009 to
6ebb5e4
Compare
|
@swift-ci please smoke test |
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.
This fixes some bugs related to implicitly inherited imports that block enabling safe interop wrappers by default.
rdar://161795145
rdar://161795429
rdar://161795673
rdar://161795793