[cxx-interop] Extend libstdc++ modulemap #59775
Open
+88
−2
Conversation
This file contains 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
|
@swift-ci please smoke test |
egorzhdan
force-pushed
the
egorzhdan/libstdcxx-modulemap
branch
from
dbc37fc
to
a7d6102
Compare
|
@swift-ci please smoke test |
egorzhdan
force-pushed
the
egorzhdan/libstdcxx-modulemap
branch
5 times, most recently
from
513d41d
to
695d48f
Compare
This fixes a circular dependency between libstdc++ and glibc modules. Glibc contains multiple include directives like `#include <stdlib.h>`. The problem is that `stdlib.h` is not only a glibc header, it is also a libstdc++ header that forwards to the glibc header. This causes Clang to assume that glibc depends on libstdc++.
egorzhdan
force-pushed
the
egorzhdan/libstdcxx-modulemap
branch
2 times, most recently
from
742e7f0
to
a926369
Compare
The modulemap needs to include the headers even if they are not supposed to be used directly from Swift: If a C++ header is being imported into Swift, and the header includes a stdlib header, clang needs to correctly deduce that the stdlib header is a part of the stdlib module, and not a part of the C++ module that we're importing.
egorzhdan
force-pushed
the
egorzhdan/libstdcxx-modulemap
branch
from
a926369
to
49e08af
Compare
|
@swift-ci please smoke test |
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.
The modulemap needs to include the headers even if they are not supposed to be used directly from Swift:
If a C++ header is being imported into Swift, and the header includes a stdlib header, clang needs to correctly deduce that the stdlib header is a part of the stdlib module, and not a part of the C++ module that we're importing.