Merge pull request #82584 from DougGregor/nonisolated-deinit-availability

"nonisolated deinit" does not have back-deployment constraints

Author: DougGregor

lib/Sema/TypeCheckAttr.cpp

@@ -7771,8 +7771,6 @@ void AttributeChecker::visitNonisolatedAttr(NonisolatedAttr *attr) {
     }
   }
 
-  diagnoseIsolatedDeinitInValueTypes(attr);
-
   if (auto VD = dyn_cast<ValueDecl>(D)) {
     //'nonisolated(unsafe)' is meaningless for computed properties, functions etc.
     auto var = dyn_cast<VarDecl>(VD);
@@ -7807,8 +7805,6 @@ void AttributeChecker::visitGlobalActorAttr(GlobalActorAttr *attr) {
     return;
   }
 
-  diagnoseIsolatedDeinitInValueTypes(attr);
-
   (void)nominal->isGlobalActor();
 }
 

test/Concurrency/assume_mainactor_typechecker_errors_sendablecheck.swift

@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend -swift-version 5 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift5- -enable-experimental-feature SendableProhibitsMainActorInference
+// RUN: %target-swift-frontend -swift-version 6 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift6- -enable-experimental-feature SendableProhibitsMainActorInference
+
+// REQUIRES: swift_feature_SendableProhibitsMainActorInference
+
+// Ensure that a Sendable-conforming protocol suppresses @MainActor inference
+// for a type.
+enum CK: CodingKey {
+  case one
+
+  func f() { }
+}
+
+nonisolated func testCK(x: CK) {
+  x.f() // okay, because CK and CK.f are not @MainActor.
+}

test/Concurrency/deinit_isolation_in_value_types.swift

@@ -19,7 +19,7 @@ struct CS: ~Copyable {
 }
 
 struct DS: ~Copyable {
-  nonisolated deinit {} // expected-error {{only classes and actors can have isolated deinit}}
+  nonisolated deinit {}
 }
 
 struct ES: ~Copyable {
@@ -47,7 +47,7 @@ enum CE: ~Copyable {
 enum DE: ~Copyable {
   case dummy
   // expected-error@+1 {{deinitializers are not yet supported on noncopyable enums}}
-  nonisolated deinit {} // expected-error {{only classes and actors can have isolated deinit}}
+  nonisolated deinit {}
 }
 
 enum EE: ~Copyable {

test/Concurrency/nonisolated_deinit.swift

@@ -0,0 +1,23 @@
+// RUN: %target-typecheck-verify-swift -swift-version 5 %s -strict-concurrency=complete -target %target-swift-5.1-abi-triple
+
+// REQUIRES: concurrency
+// REQUIRES: OS=macosx
+
+class NotSendable {}
+
+@MainActor class C {
+  var x: Int = 0
+
+  nonisolated deinit {
+    print(x)
+  }
+}
+
+// expected-note@+1{{add '@available' attribute to enclosing class}}
+@MainActor class C2 {
+  var x: Int = 0
+
+  isolated deinit { // expected-error{{isolated deinit is only available in macOS 15.4.0 or newer}}
+    print(x)
+  }
+}

test/Macros/default_main_actor_nonisolated.swift

@@ -0,0 +1,27 @@
+// REQUIRES: swift_swift_parser, executable_test
+
+// RUN: %empty-directory(%t)
+// RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath
+
+// Check for errors
+// RUN: %target-swift-frontend -swift-version 5 -typecheck -load-plugin-library %t/%target-library-name(MacroDefinition) %s -I %t -disable-availability-checking -swift-version 6 -default-isolation MainActor -enable-experimental-feature SendableProhibitsMainActorInference
+
+// REQUIRES: swift_feature_SendableProhibitsMainActorInference
+
+@attached(extension, conformances: Sendable)
+macro AddSendable() = #externalMacro(module: "MacroDefinition", type: "SendableMacro")
+
+@AddSendable
+final class SendableClass {
+  var property: Int { 0 }
+
+  func f() { }
+}
+
+nonisolated func acceptSendable<T: Sendable>(_: T) { }
+
+@concurrent func test(sc: SendableClass) async {
+  acceptSendable(sc) // SendableClass is Sendable
+  acceptSendable(\SendableClass.property) // so is its property
+  sc.f() // not on the main actor, so this is okay
+}