Skip to content

[shims] ensure that _SwiftConcurrency has the same Swift interface re… #64705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2023

Conversation

hyp
Copy link
Contributor

@hyp hyp commented Mar 29, 2023

…gardless of whether C++ interop is enabled

This ensures that a module built from Swift interface file (and as such interop is disabled), that references 'exit' (from _SwiftConcurrencyShims module) can resolve the module reference to 'exit' even when it's being imported when interop is enabled (and thus it loads a different underlying _SwiftConcurrencyShims).

…gardless of whether C++ interop is enabled

This ensures that a module built from Swift interface file (and as such interop is disabled),
that references 'exit' (from _SwiftConcurrencyShims module) can resolve the module reference to
'exit' even when it's being imported when interop is enabled (and thus it loads a different underlying _SwiftConcurrencyShims).
@hyp hyp requested a review from etcwilde March 29, 2023 01:44
@hyp hyp requested review from zoecarver and egorzhdan as code owners March 29, 2023 01:44
@hyp
Copy link
Contributor Author

hyp commented Mar 29, 2023

@swift-ci please test

@hyp
Copy link
Contributor Author

hyp commented Mar 29, 2023

@swift-ci please test source compatibility

Copy link
Member

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think this makes sense. I'm not sure why I had it in the swift namespace before, though that shouldn't affect the symbol because it's a C symbol.

@hyp
Copy link
Contributor Author

hyp commented Mar 29, 2023

Yup, unfortunately it affects the way it's imported into Swift when C++ interop is enabled, so this fixed that.

@hyp hyp merged commit 3f63573 into swiftlang:main Mar 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants