Merge pull request #41305 from kavon/deinit-isolation-warnonly

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -4486,7 +4486,9 @@ NOTE(note_distributed_actor_system_conformance_missing_adhoc_requirement,none,
 ERROR(override_implicit_unowned_executor,none,
       "cannot override an actor's 'unownedExecutor' property that wasn't "
       "explicitly defined", ())
-
+ERROR(actor_isolated_from_deinit,none,
+      "actor-isolated %0 %1 can not be referenced from a non-isolated deinit",
+      (DescriptiveDeclKind, DeclName))
 ERROR(actor_isolated_non_self_reference,none,
         "actor-isolated %0 %1 can not be "
         "%select{referenced|mutated|used 'inout'}2 "

lib/Sema/TypeCheckConcurrency.cpp

@@ -2687,12 +2687,14 @@ namespace {
     /// \param refCxt the context in which the member reference happens.
     /// \param baseActor the actor referenced in the base of the member access.
     /// \param member the declaration corresponding to the accessed member.
+    /// \param memberLoc the source location of the reference to the member.
     ///
     /// \returns true iff the member access is permitted in Sema because it will
     /// be verified later by flow-isolation.
     bool checkedByFlowIsolation(DeclContext const *refCxt,
                                 ReferencedActor &baseActor,
-                                ValueDecl const *member) {
+                                ValueDecl const *member,
+                                SourceLoc memberLoc) {
 
       // base of member reference must be `self`
       if (!baseActor.isActorSelf())
@@ -2728,6 +2730,18 @@ namespace {
         if (var->hasStorage() && var->isInstanceMember())
           return true;
 
+      // In Swift 5, we were allowing all members to be referenced from a
+      // deinit, but that will not be valid in Swift 6+, so warn about it.
+      if (!refCxt->getASTContext().isSwiftVersionAtLeast(6)) {
+        if (isa<DestructorDecl>(fnDecl) && member->isInstanceMember()) {
+          auto &diags = refCxt->getASTContext().Diags;
+          diags.diagnose(memberLoc, diag::actor_isolated_from_deinit,
+                         member->getDescriptiveKind(),
+                         member->getName()).warnUntilSwiftVersion(6);
+          return true;
+        }
+      }
+
       return false;
     }
 
@@ -2831,7 +2845,7 @@ namespace {
         // access an isolated member on `self`. If that case applies, then we
         // can skip checking.
         if (checkedByFlowIsolation(getDeclContext(), isolatedActor,
-                                          member))
+                                          member, memberLoc))
           return false;
 
         // An escaping partial application of something that is part of

test/Concurrency/actor_isolation.swift

@@ -904,7 +904,7 @@ actor SomeActorWithInits {
     let _ = self.nonSendable // OK only through typechecking, not SIL.
 
     defer {
-      isolated() // expected-error{{actor-isolated instance method 'isolated()' can not be referenced from a non-isolated context}}
+      isolated() // expected-warning{{actor-isolated instance method 'isolated()' can not be referenced from a non-isolated deinit; this is an error in Swift 6}}
       mutableState += 1 // okay
       nonisolated()
     }
@@ -920,7 +920,7 @@ actor SomeActorWithInits {
   }
 
 
-  func isolated() { } // expected-note 9 {{calls to instance method 'isolated()' from outside of its actor context are implicitly asynchronous}}
+  func isolated() { } // expected-note 8 {{calls to instance method 'isolated()' from outside of its actor context are implicitly asynchronous}}
   nonisolated func nonisolated() {}
 }
 

test/Concurrency/flow_isolation.swift

@@ -584,6 +584,7 @@ actor EscapeArtist {
 actor Ahmad {
   nonisolated func f() {}
   var prop: Int = 0
+  var computedProp: Int { 10 }
 
   init(v1: Void) {
     Task.detached { self.f() } // expected-note {{after making a copy of 'self', only non-isolated properties of 'self' can be accessed from this init}}
@@ -596,6 +597,14 @@ actor Ahmad {
     f()
     prop += 1 // expected-warning {{cannot access property 'prop' here in non-isolated initializer; this is an error in Swift 6}}
   }
+
+  deinit {
+    // expected-warning@+2 {{actor-isolated property 'computedProp' can not be referenced from a non-isolated deinit; this is an error in Swift 6}}
+    // expected-note@+1 {{after accessing property 'computedProp', only non-isolated properties of 'self' can be accessed from a deinit}}
+    let x = computedProp
+
+    prop = x // expected-warning {{cannot access property 'prop' here in deinitializer; this is an error in Swift 6}}
+  }
 }
 
 @available(SwiftStdlib 5.5, *)
@@ -622,4 +631,25 @@ actor Rain {
 
     defer { _ = hollerBack(self) }
   }
+
+  deinit {
+    x = 1
+  }
+}
+
+@available(SwiftStdlib 5.5, *)
+actor DeinitExceptionForSwift5 {
+  var x: Int = 0
+
+  func cleanup() {
+    x = 0
+  }
+
+  deinit {
+    // expected-warning@+2 {{actor-isolated instance method 'cleanup()' can not be referenced from a non-isolated deinit; this is an error in Swift 6}}
+    // expected-note@+1 {{after calling instance method 'cleanup()', only non-isolated properties of 'self' can be accessed from a deinit}}
+    cleanup()
+
+    x = 1 // expected-warning {{cannot access property 'x' here in deinitializer; this is an error in Swift 6}}
+  }
 }