[🍒][cxx-interop] Use translation unit scope when doing lookups; disambiguate math functions. #67020
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
…ons. Also add back `string.h` as a valid header and ban imports from `_SwiftConcurrencyShims`.
…t`, it's not longer relevant.
… conflict with declarations in the `Darwin` module; improve the test.
…rom `_SwiftConcurrency.h`.
…ce even in C++ mode.
zoecarver
force-pushed
the
pick-math-and-tu-commits
branch
from
0cf8303 to
4c21dd4
Compare
zoecarver
changed the title
|
@swift-ci please test |
|
@swift-ci Please Build Toolchain macOS Platform |
ravikandhadai
approved these changes
Jun 30, 2023
drodriguez
reviewed
Jul 1, 2023
Comment on lines
+3232
to
+3238
| // Use the exit function from _SwiftConcurrency.h as it is platform | ||
| // agnostic. | ||
| if ((topLevelModuleEq(decl, "Darwin") || | ||
| topLevelModuleEq(decl, "SwiftGlibc")) && | ||
| decl->getDeclName().isIdentifier() && decl->getName() == "exit") { | ||
| return nullptr; | ||
| } |
There was a problem hiding this comment.
@zoecarver: is there some reason for not doing this check like !topLevelModuleEq(decl, "SwiftConcurrencyShims") && decl->getDeclName().isIdentifier() && decl->getName() == "exit" instead? Hardcoding SwiftConcurrencyShims is bad, but at least it is just one module name, and not two. I found out about this because SwiftGlibc is the name of the overlaid module provided by Swift, but what if the system provides its own modulemap for the system headers and it is called differently?
There was a problem hiding this comment.
We want to import user-defined overloaded or nested exit functions.
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.
Explanation: There are a number of places where we issue clang lookups. With C++ mode enabled, these need to be issued with a translation unit scope. We already fixed a few clang lookups (ex. #58937) and this patch fixes a few more cases. This patch also disambiguates a few functions that exist in both Darwin and libcxx (and in the case of
exit, _SwiftConcurrency). This builds on Alex's PR (#65437).Scope: C++ interoperability
Risk: Low. I think this is mostly a low-risk change. As stated above, these bug fixes apply the same fix that has worked elsewhere, so it should be fairly sound. Using the translation unit scope is not a high-risk change (given the nature of the change, and the fact that it works elsewhere). Disambiguating the functions is slightly riskier, but will only change import behavior when C++ interop is enabled.
Testing: Swift unit tests.
PRs: #66896 and #66897