Merge pull request #75646 from tshortli/zippered-os-version-at-least-or-variant-at-least

stdlib: Add runtime support for zippered availability checks

Author: tshortli

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
 

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