From 41fad31e646a93bad0c764251fd9913989117eb6 Mon Sep 17 00:00:00 2001
From: Allan Shortlidge <shortlidge@apple.com>
Date: Fri, 2 Aug 2024 10:22:08 -0700
Subject: [PATCH] stdlib: Add runtime support for zippered availability checks.

Now that `__isPlatformOrVariantPlatformVersionAtLeast()` is available in
upstream LLVM, the implementation of the zippered variant of the OS version
check utility can use the `targetOSVersionOrVariantOSVersionAtLeast` builtin
safely.

Resolves rdar://103960437.
---
 stdlib/public/core/Availability.swift                       | 6 ------
 .../availability_query_maccatalyst_zippered_inlined.swift   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/stdlib/public/core/Availability.swift b/stdlib/public/core/Availability.swift
index 0b7759fedc140..a437a6ce71d7c 100644
--- a/stdlib/public/core/Availability.swift
+++ b/stdlib/public/core/Availability.swift
@@ -109,11 +109,6 @@ public func _stdlib_isOSVersionAtLeastOrVariantVersionAtLeast(
   _ variantMinor: Builtin.Word,
   _ variantPatch: Builtin.Word
   ) -> Builtin.Int1 {
-  return _stdlib_isOSVersionAtLeast(major, minor, patch)
-
-  // FIXME: Enable when __isPlatformOrVariantPlatformVersionAtLeast() support
-  // is added to compiler-rt.
-#if false
   if Int(major) == 9999 {
     return true._value
   }
@@ -136,7 +131,6 @@ public func _stdlib_isOSVersionAtLeastOrVariantVersionAtLeast(
           variantMajor32._value, variantMinor32._value, variantPatch32._value))
 
   return (result32 != (0 as UInt32))._value
-#endif
 }
 #endif
 
diff --git a/test/SIL/availability_query_maccatalyst_zippered_inlined.swift b/test/SIL/availability_query_maccatalyst_zippered_inlined.swift
index 1d7a411dbef2b..16da5e3824070 100644
--- a/test/SIL/availability_query_maccatalyst_zippered_inlined.swift
+++ b/test/SIL/availability_query_maccatalyst_zippered_inlined.swift
@@ -9,7 +9,7 @@
 // RUN: rm %t/Library.swiftmodule
 // RUN: %target-swift-frontend -emit-sil %t/main.swift -target %target-cpu-apple-macosx13 -target-variant %target-cpu-apple-ios16-macabi -I %t | %FileCheck %t/main.swift
 
-// REQUIRES: maccatalyst_support
+// REQUIRES: OS=macosx || OS=maccatalyst
 
 //--- Library.swift