Skip to content

[5.7][stdlib] Fix nullability logic of memcmp #42359

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 2 commits into from
May 10, 2022

Conversation

stevapple
Copy link
Contributor

Cherry-pick of #41797 into Swift 5.7 release branch.

Fix the nullability judging logic for extern int memcmp in LibcShims.h.

@stevapple stevapple requested a review from a team as a code owner April 14, 2022 03:00
#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__)
extern int memcmp(const void * _Nullable, const void * _Nullable, __swift_size_t);
// FIXME: Is there a way to identify Glibc specifically?
#if defined(__gnu_linux__)
Copy link
Member

Choose a reason for hiding this comment

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

I used __GLIBC__ before, doesn't that work?

Copy link
Contributor Author

@stevapple stevapple Apr 15, 2022

Choose a reason for hiding this comment

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

No, because the shim doesn’t (and cannot, I suppose) include any header from Glibc, so any Glibc-defined macros seem not available.

@stevapple
Copy link
Contributor Author

Anyone to test & merge?

@finagolfin
Copy link
Member

It is Sunday morning in California, you may have to wait a day.

@stevapple
Copy link
Contributor Author

stevapple commented Apr 20, 2022

Ping @stephentyrone

@finagolfin
Copy link
Member

@xymus, would you review?

@xymus
Copy link
Contributor

xymus commented May 9, 2022

@swift-ci please smoke test

@xymus
Copy link
Contributor

xymus commented May 9, 2022

@swift-ci please test

@stephentyrone stephentyrone merged commit c0a4b09 into swiftlang:release/5.7 May 10, 2022
@stevapple stevapple deleted the memcmp-5.7 branch May 24, 2022 07:35
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