Merge pull request #82311 from gottesmm/pr-29a7ec5f7fd1b97205b69527c465cac0e3b4128a

Revert "[flow-isolation] Allow for initialization of fields of a Global Actor isolated class in its nonisolated inits"

Author: gottesmm

lib/Sema/TypeCheckConcurrency.cpp

@@ -7960,17 +7960,6 @@ ActorReferenceResult ActorReferenceResult::forReference(
         (!actorInstance || actorInstance->isSelf())) {
       auto type = fromDC->mapTypeIntoContext(decl->getInterfaceType());
       if (!type->isSendableType()) {
-        // If we have an actor instance and our declIsolation is global actor
-        // isolated, but our context isolation is nonisolated... defer to flow
-        // isolation if this case passes the additional restrictions required by
-        // flow isolation (e.x.: the initializer's nominal type has to be
-        // isolated).
-        if (actorInstance &&
-            declIsolation.isGlobalActor() && contextIsolation.isNonisolated() &&
-            checkedByFlowIsolation(fromDC, *actorInstance, decl, declRefLoc, useKind)) {
-          return forSameConcurrencyDomain(declIsolation, options);
-        }
-
         // Treat the decl isolation as 'preconcurrency' to downgrade violations
         // to warnings, because violating Sendable here is accepted by the
         // Swift 5.9 compiler.

test/Concurrency/flow_isolation.swift

@@ -32,13 +32,6 @@ struct Money {
   }
 }
 
-actor OtherActorBackingActor { }
-
-@globalActor
-struct OtherActor {
-  static let shared = OtherActorBackingActor()
-}
-
 @available(SwiftStdlib 5.1, *)
 func takeBob(_ b: Bob) {}
 
@@ -839,78 +832,17 @@ func testActorWithInitAccessorInit() {
 
 @available(SwiftStdlib 5.1, *)
 actor TestNonisolatedUnsafe {
-  private nonisolated(unsafe) var child: MyOtherActor!
+  private nonisolated(unsafe) var child: OtherActor!
   init() {
-    child = MyOtherActor(parent: self)
+    child = OtherActor(parent: self)
   }
 }
 
 @available(SwiftStdlib 5.1, *)
-actor MyOtherActor {
+actor OtherActor {
   unowned nonisolated let parent: any Actor
 
   init(parent: any Actor) {
     self.parent = parent
   }
 }
-
-func globalActorNonIsolatedInitializerTests() {
-  @MainActor
-  class C {
-    let ns: NonSendableType
-
-    nonisolated init() {
-      self.ns = NonSendableType()
-    }
-
-    nonisolated init(x: NonSendableType) {
-      self.ns = x
-    }
-
-    nonisolated func doSomething() {}
-
-    nonisolated init(x2 x: NonSendableType) {
-      self.ns = x
-      doSomething() // expected-note {{after calling instance method 'doSomething()', only nonisolated properties of 'self' can be accessed from this init}}
-      print(self.ns) // expected-warning {{cannot access property 'ns' here in nonisolated initializer}}
-    }
-  }
-
-  // Make sure this does not apply in cases where self is not actor isolated.
-  class D {
-    @MainActor let ns: NonSendableType // expected-note {{mutation of this property is only permitted within the actor}}
-
-    nonisolated init() {
-      self.ns = NonSendableType() // expected-warning {{main actor-isolated property 'ns' can not be mutated from a nonisolated context}}
-    }
-  }
-
-  actor A {
-    @MainActor let ns: NonSendableType
-
-    init() {
-      self.ns = NonSendableType()
-    }
-  }
-
-  @MainActor
-  class C2 {
-    @OtherActor let ns: NonSendableType
-
-    nonisolated init() {
-      self.ns = NonSendableType()
-    }
-
-    nonisolated init(_ x: NonSendableType) {
-      self.ns = x
-    }
-
-    nonisolated func doSomething() {}
-
-    nonisolated init(x2 x: NonSendableType) {
-      self.ns = x
-      doSomething() // expected-note {{after calling instance method 'doSomething()', only nonisolated properties of 'self' can be accessed from this init}}
-      print(self.ns) // expected-warning {{cannot access property 'ns' here in nonisolated initializer}}
-    }
-  }
-}

test/Concurrency/global_actor_inference.swift

@@ -336,11 +336,13 @@ struct WrapperOnActor<Wrapped: Sendable> {
 public struct WrapperOnMainActor<Wrapped> {
   // Make sure inference of @MainActor on wrappedValue doesn't crash.
 
+  // expected-note@+1 {{mutation of this property is only permitted within the actor}}
   public var wrappedValue: Wrapped
 
   public var accessCount: Int
 
   nonisolated public init(wrappedValue: Wrapped) {
+    // expected-warning@+1 {{main actor-isolated property 'wrappedValue' can not be mutated from a nonisolated context; this is an error in the Swift 6 language mode}}
     self.wrappedValue = wrappedValue
   }
 }

test/Concurrency/global_actor_inference_swift6.swift

@@ -67,11 +67,13 @@ struct WrapperOnActor<Wrapped: Sendable> {
 public struct WrapperOnMainActor<Wrapped> {
   // Make sure inference of @MainActor on wrappedValue doesn't crash.
 
+  // expected-note@+1 {{mutation of this property is only permitted within the actor}}
   public var wrappedValue: Wrapped // expected-note {{property declared here}}
 
   public var accessCount: Int
 
   nonisolated public init(wrappedValue: Wrapped) {
+    // expected-error@+1 {{main actor-isolated property 'wrappedValue' can not be mutated from a nonisolated context}}
     self.wrappedValue = wrappedValue
   }
 }

test/Concurrency/nonisolated_rules.swift

@@ -72,8 +72,10 @@ nonisolated struct StructRemovesGlobalActor: GloballyIsolated {
   }
 
   struct Nested: GloballyIsolated {
+    // expected-note@+1 {{mutation of this property is only permitted within the actor}}
     var z: NonSendable
     nonisolated init(z: NonSendable) {
+      // expected-error@+1 {{main actor-isolated property 'z' can not be mutated from a nonisolated context}}
       self.z = z
     }
   }