Adopt 'nonisolated' in many tests, make sure its a modifier

Author: DougGregor

include/swift/AST/Attr.def

@@ -631,7 +631,8 @@ DECL_ATTR(hasAsyncAlternative, HasAsyncAlternative,
   111)
 
 CONTEXTUAL_SIMPLE_DECL_ATTR(nonisolated, Nonisolated,
-  OnFunc | OnConstructor | OnVar | OnSubscript | ConcurrencyOnly |
+  DeclModifier | OnFunc | OnConstructor | OnVar | OnSubscript |
+  ConcurrencyOnly |
   ABIStableToAdd | ABIStableToRemove |
   APIBreakingToAdd | APIStableToRemove,
   112)

test/Concurrency/actor_isolation.swift

@@ -94,12 +94,12 @@ func checkAsyncPropertyAccess() async {
 }
 
 extension MyActor {
-  @actorIndependent var actorIndependentVar: Int {
+  nonisolated var actorIndependentVar: Int {
     get { 5 }
     set { }
   }
 
-  @actorIndependent func actorIndependentFunc(otherActor: MyActor) -> Int {
+  nonisolated func actorIndependentFunc(otherActor: MyActor) -> Int {
     _ = immutable
     _ = mutable // expected-error{{actor-isolated property 'mutable' can not be referenced from an '@actorIndependent'}}
     _ = text[0] // expected-error{{actor-isolated property 'text' can not be referenced from an '@actorIndependent' context}}
@@ -593,22 +593,22 @@ actor LazyActor {
     lazy var l24: Int = self.l
     lazy var l25: Int = { [unowned self] in self.l }()
 
-    @actorIndependent lazy var l31: Int = { v }()
+    nonisolated lazy var l31: Int = { v }()
     // expected-error@-1 {{actor-isolated property 'v' can not be referenced from an '@actorIndependent' context}}
-    @actorIndependent lazy var l32: Int = v
+    nonisolated lazy var l32: Int = v
     // expected-error@-1 {{actor-isolated property 'v' can not be referenced from an '@actorIndependent' context}}
-    @actorIndependent lazy var l33: Int = { self.v }()
+    nonisolated lazy var l33: Int = { self.v }()
     // expected-error@-1 {{actor-isolated property 'v' can not be referenced from an '@actorIndependent' context}}
-    @actorIndependent lazy var l34: Int = self.v
+    nonisolated lazy var l34: Int = self.v
     // expected-error@-1 {{actor-isolated property 'v' can not be referenced from an '@actorIndependent' context}}
-    @actorIndependent lazy var l35: Int = { [unowned self] in self.v }()
+    nonisolated lazy var l35: Int = { [unowned self] in self.v }()
     // expected-error@-1 {{actor-isolated property 'v' can not be referenced from an '@actorIndependent' context}}
 
-    @actorIndependent lazy var l41: Int = { l }()
-    @actorIndependent lazy var l42: Int = l
-    @actorIndependent lazy var l43: Int = { self.l }()
-    @actorIndependent lazy var l44: Int = self.l
-    @actorIndependent lazy var l45: Int = { [unowned self] in self.l }()
+    nonisolated lazy var l41: Int = { l }()
+    nonisolated lazy var l42: Int = l
+    nonisolated lazy var l43: Int = { self.l }()
+    nonisolated lazy var l44: Int = self.l
+    nonisolated lazy var l45: Int = { [unowned self] in self.l }()
 }
 
 // Infer global actors from context only for instance members.

test/Concurrency/global_actor_inference.swift

@@ -153,7 +153,7 @@ actor GenericSub<T> : GenericSuper<[T]> {
   override func method() { }  // expected-note 2{{calls to instance method 'method()' from outside of its actor context are implicitly asynchronous}}
 
   @GenericGlobalActor<T> override func method2() { } // expected-error{{global actor 'GenericGlobalActor<T>'-isolated instance method 'method2()' has different actor isolation from global actor 'GenericGlobalActor<[T]>'-isolated overridden declaration}}
-  @actorIndependent override func method3() { } // expected-error{{actor-independent instance method 'method3()' has different actor isolation from global actor 'GenericGlobalActor<[T]>'-isolated overridden declaration}}
+  nonisolated override func method3() { } // expected-error{{actor-independent instance method 'method3()' has different actor isolation from global actor 'GenericGlobalActor<[T]>'-isolated overridden declaration}}
 
   @OtherGlobalActor func testMethod() {
     method() // expected-error{{instance method 'method()' isolated to global actor 'GenericGlobalActor<[T]>' can not be referenced from different global actor 'OtherGlobalActor'}}

test/SILGen/hop_to_executor.swift

@@ -9,16 +9,14 @@ actor MyActor {
   // CHECK-LABEL: sil hidden [ossa] @$s4test7MyActorC6calleeyySiYF : $@convention(method) @async (Int, @guaranteed MyActor) -> () {
   // CHECK-NOT:   hop_to_executor
   // CHECK:     } // end sil function '$s4test7MyActorC6calleeyySiYF'
-  @actorIndependent
-  func callee(_ x: Int) async {
+  nonisolated func callee(_ x: Int) async {
     print(x)
   }
 
   // CHECK-LABEL: sil hidden [ossa] @$s4test7MyActorC14throwingCalleeyySiYKF : $@convention(method) @async (Int, @guaranteed MyActor) -> @error Error {
   // CHECK-NOT:   hop_to_executor
   // CHECK:     } // end sil function '$s4test7MyActorC14throwingCalleeyySiYKF'
-  @actorIndependent
-  func throwingCallee(_ x: Int) async throws {
+  nonisolated func throwingCallee(_ x: Int) async throws {
     print(x)
   }
 

test/attr/attr_objc_async.swift

@@ -44,8 +44,8 @@ actor MyActor {
   @objc var badProp: AnyObject { self } // expected-error{{actor-isolated property 'badProp' cannot be @objc}}
   @objc subscript(index: Int) -> AnyObject { self } // expected-error{{actor-isolated subscript 'subscript(_:)' cannot be @objc}}
 
-  // CHECK: @objc @actorIndependent func synchronousGood()
-  @objc @actorIndependent func synchronousGood() { }
+  // CHECK: @objc nonisolated func synchronousGood()
+  @objc nonisolated func synchronousGood() { }
 }
 
 // CHECK: actor class MyActor2

test/attr/global_actor.swift

@@ -96,5 +96,5 @@ struct Container {
 // Redundant attributes
 // -----------------------------------------------------------------------
 extension SomeActor {
-  @GA1 @actorIndependent func conflict1() { } // expected-error{{instance method 'conflict1()' has multiple actor-isolation attributes ('actorIndependent' and 'GA1')}}
+  @GA1 nonisolated func conflict1() { } // expected-error{{instance method 'conflict1()' has multiple actor-isolation attributes ('nonisolated' and 'GA1')}}
 }

test/decl/class/actor/conformance.swift

@@ -48,9 +48,9 @@ actor OtherActor: SyncProtocol {
   @asyncHandler
   func syncMethodB() { }
 
-  // @actorIndependent methods are okay.
-  // FIXME: Consider suggesting @actorIndependent if this didn't match.
-  @actorIndependent func syncMethodC() -> Int { 5 }
+  // nonisolated methods are okay.
+  // FIXME: Consider suggesting nonisolated if this didn't match.
+  nonisolated func syncMethodC() -> Int { 5 }
 
   subscript (index: Int) -> String { "\(index)" }
   // expected-error@-1{{actor-isolated subscript 'subscript(_:)' cannot be used to satisfy a protocol requirement}}

test/decl/protocol/special/Actor.swift

@@ -29,7 +29,7 @@ actor A6: A1, Actor { // expected-error{{redundant conformance of 'A6' to protoc
 
 actor A7 {
   // Okay: satisfy the requirement explicitly
-  @actorIndependent func enqueue(partialTask: PartialAsyncTask) { }
+  nonisolated func enqueue(partialTask: PartialAsyncTask) { }
 }
 
 // A non-actor can conform to the Actor protocol, if it does it properly.