Skip to content

[SwiftShims] Make the void* arguments of memcmp nullable #36666

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.

Sign up for GitHub

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
Apr 5, 2021
Merged

[SwiftShims] Make the void* arguments of memcmp nullable #36666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f7f1b
[SwiftShims] Make the void* arguments of memcmp _Nullable on Darwin
xymus Mar 30, 2021
c6acc94
[Tests] memcmp-definitions should run only on Apple plaftorms
xymus Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions stdlib/public/SwiftShims/LibcShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ static inline __swift_size_t _swift_stdlib_strlen_unsigned(const unsigned char *
SWIFT_READONLY
static inline int _swift_stdlib_memcmp(const void *s1, const void *s2,
__swift_size_t n) {
#if defined(__APPLE__)
extern int memcmp(const void * _Nullable, const void * _Nullable, __swift_size_t);
#else
extern int memcmp(const void *, const void *, __swift_size_t);
#endif
return memcmp(s1, s2, n);
}

Expand Down
12 changes: 12 additions & 0 deletions validation-test/ClangImporter/memcmp-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// rdar://69876253
// REQUIRES: VENDOR=apple
// RUN: %target-build-swift %s -o %t.out

import SwiftShims
import Foundation

func foo () {
let a = UnsafeMutableRawPointer.allocate(byteCount: 4, alignment: 4)
let b = UnsafeMutableRawPointer.allocate(byteCount: 4, alignment: 4)
memcmp(a, b, 4)
}