Skip to content

[stable/20240723][darwin] Upstream __isPlatformOrVariantPlatformVersionAtLeast() #9031

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 1 commit into from
Aug 1, 2024
Merged

[stable/20240723][darwin] Upstream __isPlatformOrVariantPlatformVersionAtLeast() #9031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions compiler-rt/lib/builtins/os_version_check.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#ifdef __APPLE__

#include <TargetConditionals.h>
#include <assert.h>
#include <dispatch/dispatch.h>
#include <dlfcn.h>
#include <stdint.h>
Expand Down Expand Up @@ -270,6 +271,8 @@ static inline uint32_t ConstructVersion(uint32_t Major, uint32_t Minor,
return ((Major & 0xffff) << 16) | ((Minor & 0xff) << 8) | (Subminor & 0xff);
}

#define PLATFORM_MACOS 1

int32_t __isPlatformVersionAtLeast(uint32_t Platform, uint32_t Major,
uint32_t Minor, uint32_t Subminor) {
dispatch_once_f(&DispatchOnceCounter, NULL, initializeAvailabilityCheck);
Expand All @@ -282,6 +285,29 @@ int32_t __isPlatformVersionAtLeast(uint32_t Platform, uint32_t Major,
return AvailabilityVersionCheck(1, Versions);
}

#if TARGET_OS_OSX

int32_t __isPlatformOrVariantPlatformVersionAtLeast(
uint32_t Platform, uint32_t Major, uint32_t Minor, uint32_t Subminor,
uint32_t Platform2, uint32_t Major2, uint32_t Minor2, uint32_t Subminor2) {
dispatch_once_f(&DispatchOnceCounter, NULL, initializeAvailabilityCheck);

if (!AvailabilityVersionCheck) {
// Handle case of back-deployment for older macOS.
if (Platform == PLATFORM_MACOS) {
return __isOSVersionAtLeast(Major, Minor, Subminor);
}
assert(Platform2 == PLATFORM_MACOS && "unexpected platform");
return __isOSVersionAtLeast(Major2, Minor2, Subminor2);
}
dyld_build_version_t Versions[] = {
{Platform, ConstructVersion(Major, Minor, Subminor)},
{Platform2, ConstructVersion(Major2, Minor2, Subminor2)}};
return AvailabilityVersionCheck(2, Versions);
}

#endif

#elif __ANDROID__

#include <pthread.h>
Expand Down
11 changes: 11 additions & 0 deletions compiler-rt/test/builtins/TestCases/Darwin/platform_version_check_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,22 @@ typedef unsigned int uint32_t;
int32_t __isPlatformVersionAtLeast(uint32_t Platform, uint32_t Major,
uint32_t Minor, uint32_t Subminor);

int32_t __isPlatformOrVariantPlatformVersionAtLeast(
uint32_t Platform, uint32_t Major, uint32_t Minor, uint32_t Subminor,
uint32_t Platform2, uint32_t Major2, uint32_t Minor2, uint32_t Subminor2);

void exit(int status);

#define PLATFORM_MACOS 1
#define PLATFORM_IOS 2

int32_t check(uint32_t Major, uint32_t Minor, uint32_t Subminor) {
int32_t Result =
__isPlatformVersionAtLeast(PLATFORM_MACOS, Major, Minor, Subminor);
int32_t ResultVariant = __isPlatformOrVariantPlatformVersionAtLeast(
PLATFORM_MACOS, Major, Minor, Subminor, PLATFORM_IOS, 13, 0, 0);
if (Result != ResultVariant)
exit(-1);
return Result;
}

Expand Down