Skip to content

[5.9] Build private swift interface files from stdlib #65986

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented May 17, 2023

Cherry-pick of #64587, #64878 -- these ensure we can consume SPI from swiftinterfaces alone when we are building the standard library with skip-early-swiftdriver in some build setups.

Risk: low -- this generates additional files that duplicate content already in the swiftmodules

Addresses rdar://108900952

etcwilde added 2 commits May 17, 2023 08:33
We have various pieces of SPI that are getting used in tests that are
failing occasionally. The swiftmodule file has the SPI, so if the
compiler loads from the swiftmodule file, everything works fine. If the
compiler loads the interface from the swiftinterface file, it fails to
find the `startOnMainActor` declaration.

Addresses rdar://108900952

(cherry picked from commit 14956ef,
 swiftlang#64587)
Need to swap out the private interface for catalyst builds.

Addresses rdar://108900952

(cherry picked from commit e5bbffc,
 swiftlang#64878)
@edymtt edymtt requested a review from etcwilde May 17, 2023 21:32
@edymtt edymtt requested a review from a team as a code owner May 17, 2023 21:32
@edymtt
Copy link
Contributor Author

edymtt commented May 17, 2023

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented May 17, 2023

@swift-ci please build toolchain

@etcwilde
Copy link
Contributor

CC @xymus

@edymtt edymtt requested a review from xymus May 23, 2023 17:50
Copy link
Contributor

@xymus xymus left a comment

Choose a reason for hiding this comment

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

It looks good, thanks!

@najacque najacque merged commit f1264c9 into swiftlang:release/5.9 May 23, 2023
@edymtt edymtt deleted the emiotto/emit-private-interfaces-5.9 branch May 24, 2023 14:15
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.

4 participants