[stdlib][test] Adopt availability macros in tests

Author: lorentey

stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift

@@ -982,7 +982,7 @@ self.test("\(testNamePrefix).partition/DispatchesThroughDirectStorageAccessors")
     withUnsafeMutableBufferPointerIsSupported ? 1 : 0,
     actualWUMBPIFNonNil + actualWCMSIAIFNonNil)
 
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     // `partition(by:)` is expected to dispatch to the public API in releases
     // that contain https://github.com/apple/swift/pull/36003.
     expectEqual(0, actualWUMBPIF)

stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.swift

@@ -66,7 +66,7 @@ public func getUInt64(_ x: UInt64) -> UInt64 { return _opaqueIdentity(x) }
 public func getUInt(_ x: UInt) -> UInt { return _opaqueIdentity(x) }
 
 #if !((os(macOS) || targetEnvironment(macCatalyst)) && arch(x86_64))
-@available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(SwiftStdlib 5.3, *)
 @inline(never)
 public func getFloat16(_ x: Float16) -> Float16 { return _opaqueIdentity(x) }
 #endif

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -270,7 +270,7 @@ public func _isStdlibDebugConfiguration() -> Bool {
 
 // Return true if the Swift runtime available is at least 5.1
 public func _hasSwift_5_1() -> Bool {
-  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+  if #available(SwiftStdlib 5.1, *) {
     return true
   }
   return false

test/Casting/CastTraps.swift.gyb

@@ -105,7 +105,7 @@ CastTrapsTestSuite.test("${t1}__${t2}")
 % end
 
 protocol P2 {}
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
 CastTrapsTestSuite.test("Unexpected null")
   .crashOutputMatches("Found unexpected null pointer value while trying to cast value of type '")
   .crashOutputMatches("Foo'")
@@ -125,7 +125,7 @@ CastTrapsTestSuite.test("Unexpected null")
 
 
 #if _runtime(_ObjC)
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
 CastTrapsTestSuite.test("Unexpected Obj-C null")
   .crashOutputMatches("Found unexpected null pointer value while trying to cast value of type '")
   .crashOutputMatches("NSObject'")

test/Casting/Casts.swift

@@ -102,7 +102,7 @@ CastsTests.test("Optional<T>.none can be casted to Optional<U>.none in generic c
 #if _runtime(_ObjC)
 protocol P2 {}
 CastsTests.test("Cast from ObjC existential to Protocol (SR-3871)") {
-  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
+  if #available(SwiftStdlib 5.3, *) {
     struct S: P2 {}
 
     class ObjCWrapper {
@@ -167,7 +167,7 @@ CastsTests.test("Dynamic casts of CF types to protocol existentials (SR-2289)")
     reason: "This test behaves unpredictably in optimized mode."))
 .code {
   expectTrue(isP(10 as Int))
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectTrue(isP(CFBitVector.makeImmutable(from: [10, 20])))
     expectTrue(isP(CFMutableBitVector.makeMutable(from: [10, 20])))
   }
@@ -195,7 +195,7 @@ CastsTests.test("Casting struct -> Obj-C -> Protocol fails (SR-3871, SR-5590, SR
 
 
 protocol P4552 {}
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
 CastsTests.test("Casting Any(Optional(T)) -> Protocol fails (SR-4552)") {
   struct S: P4552 {
     let tracker = LifetimeTracked(13)
@@ -257,7 +257,7 @@ CastsTests.test("Store Swift metatype in ObjC property and cast back to Any.Type
   let sValue2 = a.sVar as? Any.Type
   let objcValue2 = a.objcVar as? Any.Type
   expectTrue(sValue2 == b)
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectTrue(sValue2 == objcValue2)
     expectTrue(objcValue2 == b)
   }
@@ -303,7 +303,7 @@ CastsTests.test("Casts from @objc Type") {
   let user = User(name: "Kermit")
   let exporter: Exporter = UserExporter()
 
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectTrue(exporter.type is User.Type)
   }
   expectNotNil(exporter.export(item: user))
@@ -319,7 +319,7 @@ CastsTests.test("Conditional NSNumber -> Bool casts") {
 #endif
 
 // rdar://45217461 ([dynamic casting] [SR-8964]: Type check operator (is) fails for Any! variable holding an Error (struct) value)
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
 CastsTests.test("Casts from Any(struct) to Error (SR-8964)") {
   struct MyError: Error { }
 
@@ -393,7 +393,7 @@ CastsTests.test("Swift Protocol Metatypes don't self-conform") {
   let a = SwiftProtocol.self
   // `is P.Protocol` tests whether the argument is a subtype of P.
   // In particular, the protocol identifier `P.self` is such a subtype.
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectNotNil(runtimeCast(a, to: SwiftProtocol.Protocol.self)) // Fixed by rdar://58991956
   }
   expectNotNil(a as? SwiftProtocol.Protocol)
@@ -446,7 +446,7 @@ CastsTests.test("Self-conformance for Error.self")
 @objc protocol ObjCProtocol {}
 CastsTests.test("ObjC Protocol Metatypes self-conform") {
   let a = ObjCProtocol.self
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectNotNil(runtimeCast(a, to: ObjCProtocol.Protocol.self))
   }
   expectNotNil(a as? ObjCProtocol.Protocol)
@@ -472,7 +472,7 @@ CastsTests.test("String/NSString extension compat") {
 #endif
 
 protocol P1999 {}
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
 CastsTests.test("Cast Any(Optional(class)) to Protocol type (SR-1999)") {
   class Foo: P1999 { }
 

test/Concurrency/Runtime/async_stream.swift

@@ -26,7 +26,7 @@ var tests = TestSuite("AsyncStream")
 
 @main struct Main {
   static func main() async {
-    if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+    if #available(SwiftStdlib 5.5, *) {
       final class Expectation: UnsafeSendable {
         var fulfilled = false
       }

test/Constraints/async.swift

@@ -2,38 +2,38 @@
 
 // REQUIRES: concurrency
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func doAsynchronously() async { }
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func doSynchronously() { }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func testConversions() async {
   let _: () -> Void = doAsynchronously // expected-error{{invalid conversion from 'async' function of type '() async -> ()' to synchronous function type '() -> Void'}}
   let _: () async -> Void = doSynchronously // okay
 }
 
 // Overloading
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 @available(swift, deprecated: 4.0, message: "synchronous is no fun")
 func overloadedSame(_: Int = 0) -> String { "synchronous" }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func overloadedSame() async -> String { "asynchronous" }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func overloaded() -> String { "synchronous" }
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func overloaded() async -> Double { 3.14159 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 @available(swift, deprecated: 4.0, message: "synchronous is no fun")
 func overloadedOptDifference() -> String { "synchronous" }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func overloadedOptDifference() async -> String? { nil }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func testOverloadedSync() {
   _ = overloadedSame() // expected-warning{{synchronous is no fun}}
 
@@ -63,7 +63,7 @@ func testOverloadedSync() {
   let _: Int = fn4 // expected-error{{value of type '() async -> ()'}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func testOverloadedAsync() async {
   _ = await overloadedSame() // no warning
 
@@ -98,12 +98,12 @@ func testOverloadedAsync() async {
   let _: Int = fn4 // expected-error{{value of type '() async -> ()'}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func takesAsyncClosure(_ closure: () async -> String) -> Int { 0 }
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func takesAsyncClosure(_ closure: () -> String) -> String { "" }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func testPassAsyncClosure() {
   let a = takesAsyncClosure { await overloadedSame() }
   let _: Double = a // expected-error{{convert value of type 'Int'}}
@@ -112,7 +112,7 @@ func testPassAsyncClosure() {
   let _: Double = b // expected-error{{convert value of type 'String'}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 struct FunctionTypes {
   var syncNonThrowing: () -> Void
   var syncThrowing: () throws -> Void
@@ -135,27 +135,27 @@ struct FunctionTypes {
 }
 
 // Overloading when there is conversion from sync to async.
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func bar(_ f: (Int) -> Int) -> Int {
   return f(2)
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func bar(_ f: (Int) async -> Int) async -> Int {
   return await f(2)
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func incrementSync(_ x: Int) -> Int {
   return x + 1
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func incrementAsync(_ x: Int) async -> Int {
   return x + 1
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func testAsyncWithConversions() async {
   _ = bar(incrementSync)
   _ = bar { -$0 }

test/Constraints/diagnostics.swift

@@ -1219,22 +1219,22 @@ func voidFuncWithEffects1() throws {
   // expected-note@-2 {{did you mean to add a return type?}}{{35-35= -> <#Return Type#>}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func voidFuncWithEffects2() async throws {
   return 1
   // expected-error@-1 {{unexpected non-void return value in void function}}
   // expected-note@-2 {{did you mean to add a return type?}}{{41-41= -> <#Return Type#>}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 // expected-error@+1 {{'async' must precede 'throws'}}
 func voidFuncWithEffects3() throws async {
   return 1
   // expected-error@-1 {{unexpected non-void return value in void function}}
   // expected-note@-2 {{did you mean to add a return type?}}{{41-41= -> <#Return Type#>}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func voidFuncWithEffects4() async {
   return 1
   // expected-error@-1 {{unexpected non-void return value in void function}}
@@ -1247,7 +1247,7 @@ func voidFuncWithEffects5(_ closure: () throws -> Void) rethrows {
   // expected-note@-2 {{did you mean to add a return type?}}{{65-65= -> <#Return Type#>}}
 }
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 func voidGenericFuncWithEffects<T>(arg: T) async where T: CustomStringConvertible {
   return 1
   // expected-error@-1 {{unexpected non-void return value in void function}}

test/IRGen/opaque_result_type_access_path.swift

@@ -31,18 +31,18 @@ extension X : P where T : P {
   }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 func bar() -> some P {
   return 27
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 func foo() -> some P {
   return X(bar())
 }
 
 // CHECK: 27
-if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+if #available(SwiftStdlib 5.1, *) {
 print(foo().get())
 } else {
   print(27)

test/Interpreter/SDK/check_class_for_archiving.swift

@@ -64,13 +64,13 @@ suite.test("NSKeyedUnarchiver") {
 }
 
 // Disable negative tests on older OSes because of rdar://problem/50504765
-if #available(macOS 12, iOS 15, watchOS 8, tvOS 15, *) {
+if #available(SwiftStdlib 5.5, *) {
   suite.test("PrivateClass") {
     expectNotEqual(0, NSKeyedUnarchiver._swift_checkClassAndWarnForKeyedArchiving(PrivateClass.self, operation: op))
   }
 }
 
-if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+if #available(SwiftStdlib 5.5, *) {
   // Generic classes and nested classes were considered to have unstable names
   // in earlier releases.
   suite.test("GenericClass") {

test/Interpreter/SDK/check_class_for_archiving_log.swift

@@ -13,7 +13,7 @@
 import Foundation
 
 // A tricky way to make the FileCheck tests conditional on the OS version.
-if #available(macOS 12, iOS 15, watchOS 8, tvOS 15, *) {
+if #available(SwiftStdlib 5.5, *) {
   print("-check-prefix=CHECK")
 } else {
   // Disable the checks for older OSes because of rdar://problem/50504765

test/Interpreter/SDK/protocol_lookup_foreign.swift

@@ -42,7 +42,7 @@ ProtocolLookupForeign.test("NSPoint") {
 }
 
 ProtocolLookupForeign.test("CFSet") {
-  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+  if #available(SwiftStdlib 5.5, *) {
     expectEqual("CFSet", fooify(CFSetCreate(kCFAllocatorDefault, nil, 0, nil)!))
   }
 }