Skip to content

[Shims] Fix nullability for musl. #73748

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
May 20, 2024

Conversation

al45tair
Copy link
Contributor

Apparently I got the merge for this slightly wrong.

rdar://128388845

Apparently I got the merge for this slightly wrong.

rdar://128388845
@al45tair al45tair added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.0 labels May 20, 2024
@al45tair al45tair requested a review from a team as a code owner May 20, 2024 11:20
@al45tair
Copy link
Contributor Author

@swift-ci Please test

@al45tair
Copy link
Contributor Author

Explanation: When merging my Musl changes, I hit a conflict with an Android change and apparently got the merge every so slightly wrong, the result being that we see the wrong declaration of memcmp() when building the static Linux SDK, which causes a build failure because the signature doesn't match (so instead memcmp() with the wrong signature ends up floating about in random modules). This only affects building the static Linux SDK; it doesn't affect anything else.
Original PR: #73747
Risk: Basically zero. This only affects building (but not using) the static Linux SDK.
Reviewed by: @mikeash
Resolves: rdar://128388845
Tests: Without this fix, building the Linux static SDK fails. With it, it succeeds.

@al45tair al45tair merged commit ddb83d1 into swiftlang:release/6.0 May 20, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants