Add @Availability to some concurrency tests that were missing it.

mikeash · mikeash · commit 6d2fc9e9bdd6 · 2021-04-01T15:34:33.000-04:00
diff --git a/test/DebugInfo/async-boxed-arg.swift b/test/DebugInfo/async-boxed-arg.swift
@@ -2,6 +2,7 @@
 // RUN:    -module-name M -enable-experimental-concurrency | %FileCheck %s
 // REQUIRES: concurrency
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension Collection {
   public func f() async throws {
     return await try Task.withGroup(resultType: Element.self) { group in
diff --git a/test/ModuleInterface/Inputs/MeowActor.swift b/test/ModuleInterface/Inputs/MeowActor.swift
@@ -1,3 +1,4 @@
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @globalActor public final class MeowActor {
   public static let shared = _Impl()
   
diff --git a/test/ModuleInterface/actor_protocol.swift b/test/ModuleInterface/actor_protocol.swift
@@ -12,38 +12,46 @@
 // CHECK-EXTENSION-NOT: extension {{.+}} : _Concurrency.Actor
 
 // CHECK: public actor PlainActorClass {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor PlainActorClass {
   @actorIndependent public func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // CHECK: public actor ExplicitActorClass : _Concurrency.Actor {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor ExplicitActorClass : Actor {
   @actorIndependent public func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // CHECK: public actor EmptyActor {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor EmptyActor {}
 
 // CHECK: actor public class EmptyActorClass {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor class EmptyActorClass {}
 
 // CHECK: public protocol Cat : _Concurrency.Actor {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public protocol Cat : Actor {
   func mew()
 }
 
 // CHECK: public actor HouseCat : Library.Cat {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor HouseCat : Cat {
   @asyncHandler public func mew() {}
   @actorIndependent public func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // CHECK: public protocol ToothyMouth {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public protocol ToothyMouth {
   func chew()
 }
 
 // CHECK: public actor Lion : Library.ToothyMouth, _Concurrency.Actor {
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public actor Lion : ToothyMouth, Actor {
   @asyncHandler public func chew() {}
   @actorIndependent public func enqueue(partialTask: PartialAsyncTask) { }
diff --git a/test/ModuleInterface/global-actor.swift b/test/ModuleInterface/global-actor.swift
@@ -3,6 +3,7 @@
 
 import MeowActor
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @MeowActor func doMeow() {}
 
 // RUN: %target-swift-frontend -enable-experimental-concurrency -enable-library-evolution -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
@@ -13,6 +14,7 @@ import MeowActor
 // RUN: %target-swift-frontend -enable-experimental-concurrency -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-FRAGILE %s
 // CHECK-FRAGILE: metatype $@thin MeowActor.Type
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func someFunc() async {
   await doMeow()
 }
diff --git a/test/Sanitizers/tsan/actor_counters.swift b/test/Sanitizers/tsan/actor_counters.swift
@@ -13,6 +13,7 @@ import Darwin
 import Glibc
 #endif
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor Counter {
   private var value = 0
   private let scratchBuffer: UnsafeMutableBufferPointer<Int>
@@ -41,6 +42,7 @@ actor Counter {
 }
 
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func worker(identity: Int, counters: [Counter], numIterations: Int) async {
   for i in 0..<numIterations {
     let counterIndex = Int.random(in: 0 ..< counters.count)
@@ -50,6 +52,7 @@ func worker(identity: Int, counters: [Counter], numIterations: Int) async {
   }
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {
   // Create counter actors.
   var counters: [Counter] = []
@@ -76,6 +79,7 @@ func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {
   print("DONE!")
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @main struct Main {
   static func main() async {
     // Useful for debugging: specify counter/worker/iteration counts
diff --git a/test/Sanitizers/tsan/basic_future.swift b/test/Sanitizers/tsan/basic_future.swift
@@ -17,10 +17,12 @@ enum HomeworkError: Error, Equatable {
   case dogAteIt(String)
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func formGreeting(name: String) async -> String {
   return "Hello \(name) from async world"
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func testSimple(
   name: String, dogName: String, shouldThrow: Bool, doSuspend: Bool
 ) async {
@@ -73,6 +75,7 @@ func testSimple(
 }
 
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @main struct Main {
   static func main() async {
     await testSimple(name: "Ted", dogName: "Hazel", shouldThrow: false, doSuspend: false)
diff --git a/test/Sanitizers/tsan/racy_actor_counters.swift b/test/Sanitizers/tsan/racy_actor_counters.swift
@@ -15,6 +15,7 @@
 
 var globalCounterValue = 0
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor Counter {
   func next() -> Int {
     let current = globalCounterValue
@@ -23,6 +24,7 @@ actor Counter {
   }
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func worker(identity: Int, counters: [Counter], numIterations: Int) async {
   for _ in 0..<numIterations {
     let counterIndex = Int.random(in: 0 ..< counters.count)
@@ -32,6 +34,7 @@ func worker(identity: Int, counters: [Counter], numIterations: Int) async {
   }
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {
   // Create counter actors.
   var counters: [Counter] = []
@@ -57,6 +60,7 @@ func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {
   print("DONE!")
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @main struct Main {
   static func main() async {
     // Useful for debugging: specify counter/worker/iteration counts
diff --git a/test/decl/protocol/special/Actor.swift b/test/decl/protocol/special/Actor.swift
@@ -3,43 +3,53 @@
 
 // Synthesis of for actores.
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A1 {
   var x: Int = 17
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A2: Actor {
   var x: Int = 17
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A3<T>: Actor {
   var x: Int = 17
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A4: A1 {
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A5: A2 {
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A6: A1, Actor { // expected-error{{redundant conformance of 'A6' to protocol 'Actor'}}
   // expected-note@-1{{'A6' inherits conformance to protocol 'Actor' from superclass here}}
 }
 
 // Explicitly satisfying the requirement.
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 actor A7 {
   // Okay: satisfy the requirement explicitly
   nonisolated func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // A non-actor can conform to the Actor protocol, if it does it properly.
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 class C1: Actor { // expected-error{{non-final class 'C1' cannot conform to `Sendable`; use `UnsafeSendable`}}
   func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // Make sure the conformances actually happen.
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func acceptActor<T: Actor>(_: T.Type) { }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func testConformance() {
   acceptActor(A1.self)
   acceptActor(A2.self)
diff --git a/test/stmt/errors_async.swift b/test/stmt/errors_async.swift
@@ -6,6 +6,7 @@ enum MyError : Error {
   case bad
 }
 
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 func shouldThrow() async {
   // expected-error@+1 {{errors thrown from here are not handled}}
   let _: Int = try await withUnsafeThrowingContinuation { continuation in

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`1`	`2`	`@globalActor public final class MeowActor {`
`2`	`3`	`public static let shared = _Impl()`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import Darwin`
`13`	`13`	`import Glibc`
`14`	`14`	`#endif`
`15`	`15`
	`16`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`16`	`17`	`actor Counter {`
`17`	`18`	`private var value = 0`
`18`	`19`	`private let scratchBuffer: UnsafeMutableBufferPointer<Int>`
`@@ -41,6 +42,7 @@ actor Counter {`
`41`	`42`	`}`
`42`	`43`
`43`	`44`
	`45`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`44`	`46`	`func worker(identity: Int, counters: [Counter], numIterations: Int) async {`
`45`	`47`	`for i in 0..<numIterations {`
`46`	`48`	`let counterIndex = Int.random(in: 0 ..< counters.count)`
`@@ -50,6 +52,7 @@ func worker(identity: Int, counters: [Counter], numIterations: Int) async {`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`
	`55`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`53`	`56`	`func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {`
`54`	`57`	`// Create counter actors.`
`55`	`58`	`var counters: [Counter] = []`
`@@ -76,6 +79,7 @@ func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {`
`76`	`79`	`print("DONE!")`
`77`	`80`	`}`
`78`	`81`
	`82`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`79`	`83`	`@main struct Main {`
`80`	`84`	`static func main() async {`
`81`	`85`	`// Useful for debugging: specify counter/worker/iteration counts`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,12 @@ enum HomeworkError: Error, Equatable {`
`17`	`17`	`case dogAteIt(String)`
`18`	`18`	`}`
`19`	`19`
	`20`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`20`	`21`	`func formGreeting(name: String) async -> String {`
`21`	`22`	`return "Hello \(name) from async world"`
`22`	`23`	`}`
`23`	`24`
	`25`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`24`	`26`	`func testSimple(`
`25`	`27`	`name: String, dogName: String, shouldThrow: Bool, doSuspend: Bool`
`26`	`28`	`) async {`
`@@ -73,6 +75,7 @@ func testSimple(`
`73`	`75`	`}`
`74`	`76`
`75`	`77`
	`78`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`76`	`79`	`@main struct Main {`
`77`	`80`	`static func main() async {`
`78`	`81`	`await testSimple(name: "Ted", dogName: "Hazel", shouldThrow: false, doSuspend: false)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`var globalCounterValue = 0`
`17`	`17`
	`18`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`18`	`19`	`actor Counter {`
`19`	`20`	`func next() -> Int {`
`20`	`21`	`let current = globalCounterValue`
`@@ -23,6 +24,7 @@ actor Counter {`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`
	`27`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`26`	`28`	`func worker(identity: Int, counters: [Counter], numIterations: Int) async {`
`27`	`29`	`for _ in 0..<numIterations {`
`28`	`30`	`let counterIndex = Int.random(in: 0 ..< counters.count)`
`@@ -32,6 +34,7 @@ func worker(identity: Int, counters: [Counter], numIterations: Int) async {`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`
	`37`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`35`	`38`	`func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {`
`36`	`39`	`// Create counter actors.`
`37`	`40`	`var counters: [Counter] = []`
`@@ -57,6 +60,7 @@ func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {`
`57`	`60`	`print("DONE!")`
`58`	`61`	`}`
`59`	`62`
	`63`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`60`	`64`	`@main struct Main {`
`61`	`65`	`static func main() async {`
`62`	`66`	`// Useful for debugging: specify counter/worker/iteration counts`
Original file line number	Diff line number	Diff line change
`@@ -3,43 +3,53 @@`
`3`	`3`
`4`	`4`	`// Synthesis of for actores.`
`5`	`5`
	`6`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`6`	`7`	`actor A1 {`
`7`	`8`	`var x: Int = 17`
`8`	`9`	`}`
`9`	`10`
	`11`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`10`	`12`	`actor A2: Actor {`
`11`	`13`	`var x: Int = 17`
`12`	`14`	`}`
`13`	`15`
	`16`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`14`	`17`	`actor A3<T>: Actor {`
`15`	`18`	`var x: Int = 17`
`16`	`19`	`}`
`17`	`20`
	`21`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`18`	`22`	`actor A4: A1 {`
`19`	`23`	`}`
`20`	`24`
	`25`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`21`	`26`	`actor A5: A2 {`
`22`	`27`	`}`
`23`	`28`
	`29`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`24`	`30`	`actor A6: A1, Actor { // expected-error{{redundant conformance of 'A6' to protocol 'Actor'}}`
`25`	`31`	`// expected-note@-1{{'A6' inherits conformance to protocol 'Actor' from superclass here}}`
`26`	`32`	`}`
`27`	`33`
`28`	`34`	`// Explicitly satisfying the requirement.`
`29`	`35`
	`36`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`30`	`37`	`actor A7 {`
`31`	`38`	`// Okay: satisfy the requirement explicitly`
`32`	`39`	`nonisolated func enqueue(partialTask: PartialAsyncTask) { }`
`33`	`40`	`}`
`34`	`41`
`35`	`42`	`// A non-actor can conform to the Actor protocol, if it does it properly.`
	`43`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`36`	`44`	class C1: Actor { // expected-error{{non-final class 'C1' cannot conform to `Sendable`; use `UnsafeSendable`}}
`37`	`45`	`func enqueue(partialTask: PartialAsyncTask) { }`
`38`	`46`	`}`
`39`	`47`
`40`	`48`	`// Make sure the conformances actually happen.`
	`49`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`41`	`50`	`func acceptActor<T: Actor>(_: T.Type) { }`
`42`	`51`
	`52`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`43`	`53`	`func testConformance() {`
`44`	`54`	`acceptActor(A1.self)`
`45`	`55`	`acceptActor(A2.self)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ enum MyError : Error {`
`6`	`6`	`case bad`
`7`	`7`	`}`
`8`	`8`
	`9`	`+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)`
`9`	`10`	`func shouldThrow() async {`
`10`	`11`	`// expected-error@+1 {{errors thrown from here are not handled}}`
`11`	`12`	`let _: Int = try await withUnsafeThrowingContinuation { continuation in`