temporary -experimental flag for IsolatedDeinit

ktoso · ktoso · commit a6bc0e675977 · 2024-09-18T12:52:37.000+09:00
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -5912,14 +5912,16 @@ ERROR(async_named_decl_must_be_available_from_async,none,
 ERROR(async_unavailable_decl,none,
       "%kindbase0 is unavailable from asynchronous contexts%select{|; %1}1",
       (const ValueDecl *, StringRef))
-      
-      
+
 ERROR(isolated_deinit_no_isolation,none,
       "deinit is marked isolated, but containing class %0 is not isolated to an actor",
       (DeclName))
 ERROR(isolated_deinit_on_value_type,none,
       "only classes and actors can have isolated deinit",
       ())
+ERROR(isolated_deinit_experimental,none,
+      "'isolated' deinit requires frontend flag -enable-experimental-feature IsolatedDeinit "
+      "to enable the usage of this language feature", ())
 
 //------------------------------------------------------------------------------
 // MARK: String Processing
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -111,7 +111,14 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   }
 
   void diagnoseIsolatedDeinitInValueTypes(DeclAttribute *attr) {
+    auto &C = D->getASTContext();
+
     if (isa<DestructorDecl>(D)) {
+      if (!C.LangOpts.hasFeature(Feature::IsolatedDeinit)) {
+        diagnoseAndRemoveAttr(attr, diag::isolated_deinit_experimental);
+        return;
+      }
+
       if (auto nominal = dyn_cast<NominalTypeDecl>(D->getDeclContext())) {
         if (!isa<ClassDecl>(nominal)) {
           // only classes and actors can have isolated deinit.
diff --git a/test/Concurrency/Runtime/actor_deinit_escaping_self.swift b/test/Concurrency/Runtime/actor_deinit_escaping_self.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)
+// RUN: %target-run-simple-swift( -enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)
 
 // REQUIRES: executable_test
 // REQUIRES: libdispatch
diff --git a/test/Concurrency/Runtime/actor_recursive_deinit.swift b/test/Concurrency/Runtime/actor_recursive_deinit.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library) | %FileCheck %s
+// RUN: %target-run-simple-swift(-enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library) | %FileCheck %s
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
diff --git a/test/Concurrency/Runtime/async_task_locals_isolated_deinit.swift b/test/Concurrency/Runtime/async_task_locals_isolated_deinit.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -plugin-path %swift-plugin-dir -Xfrontend -disable-availability-checking -parse-stdlib %import-libdispatch %s -o %t/a.out
+// RUN: %target-build-swift -plugin-path %swift-plugin-dir -enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking -parse-stdlib %import-libdispatch %s -o %t/a.out
 // RUN: %target-codesign %t/a.out
 // RUN: %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=swift6 %target-run %t/a.out
 
@@ -9,6 +9,8 @@
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
 
+// REQUIRES: gh76538
+
 import Swift
 import _Concurrency
 import Dispatch
@@ -131,6 +133,7 @@ if #available(SwiftStdlib 5.1, *) {
     let group = DispatchGroup()
     group.enter(1)
     Task {
+      // FIXME: isolated deinit should be clearing task locals
       await TL.$number.withValue(42) {
         await AnotherActor.shared.performTesting {
           _ = ClassNoOp(expectedNumber: 42, group: group)
@@ -155,6 +158,7 @@ if #available(SwiftStdlib 5.1, *) {
     let group = DispatchGroup()
     group.enter(1)
     Task {
+      // FIXME: isolated deinit should be clearing task locals
       TL.$number.withValue(99) {
         // Despite last release happening not on the actor itself,
         // this is still a fast path due to optimisation for deallocating actors.
diff --git a/test/Concurrency/Runtime/isolated_deinit_main_sync.swift b/test/Concurrency/Runtime/isolated_deinit_main_sync.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking) | %FileCheck %s
+// RUN: %target-run-simple-swift(-enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking) | %FileCheck %s
 
 var isDead: Bool = false
 
diff --git a/test/Concurrency/deinit_isolation.swift b/test/Concurrency/deinit_isolation.swift
@@ -1,6 +1,6 @@
-// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -verify %s
-// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
-// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
+// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -enable-experimental-feature IsolatedDeinit -emit-silgen -verify %s
+// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -enable-experimental-feature IsolatedDeinit -emit-silgen -DSILGEN %s | %FileCheck %s
+// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -enable-experimental-feature IsolatedDeinit -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
 
 // REQUIRES: concurrency
 
diff --git a/test/Concurrency/deinit_isolation_import/test.swift b/test/Concurrency/deinit_isolation_import/test.swift
@@ -3,16 +3,16 @@
 // RUN: cp -R $INPUT_DIR/Alpha.framework %t/Frameworks/
 // RUN: %empty-directory(%t/Frameworks/Alpha.framework/Modules/Alpha.swiftmodule)
 // RUN: %empty-directory(%t/Frameworks/Alpha.framework/Headers/)
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -parse-as-library -module-name Alpha \
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -parse-as-library -module-name Alpha \
 // RUN:  -emit-module -o %t/Frameworks/Alpha.framework/Modules/Alpha.swiftmodule/%module-target-triple.swiftmodule \
 // RUN:  -enable-objc-interop -disable-objc-attr-requires-foundation-module \
 // RUN:  -emit-objc-header -emit-objc-header-path %t/Frameworks/Alpha.framework/Headers/Alpha-Swift.h $INPUT_DIR/Alpha.swift
 // RUN: cp -R $INPUT_DIR/Beta.framework %t/Frameworks/
 // RUN: %empty-directory(%t/Frameworks/Beta.framework/Headers/)
 // RUN: cp $INPUT_DIR/Beta.h %t/Frameworks/Beta.framework/Headers/Beta.h
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
 
 // REQUIRES: concurrency
 // REQUIRES: objc_interop
diff --git a/test/Concurrency/deinit_isolation_in_value_types.swift b/test/Concurrency/deinit_isolation_in_value_types.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -verify %s
+// RUN: %target-swift-frontend -disable-availability-checking -enable-experimental-feature IsolatedDeinit -parse-as-library -emit-silgen -verify %s
 
 @globalActor final actor FirstActor {
   static let shared = FirstActor()
diff --git a/test/Concurrency/deinit_isolation_objc.swift b/test/Concurrency/deinit_isolation_objc.swift
@@ -1,6 +1,6 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -verify %s
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -verify %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
 
 // REQUIRES: concurrency
 // REQUIRES: objc_interop
diff --git a/test/Concurrency/deinit_isolation_tbd.swift b/test/Concurrency/deinit_isolation_tbd.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature IsolatedDeinit -emit-ir %s | %FileCheck %s
 
 public class Foo {
   @MainActor
diff --git a/test/Distributed/Runtime/distributed_actor_deinit.swift b/test/Distributed/Runtime/distributed_actor_deinit.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -Xfrontend -disable-availability-checking %import-libdispatch -parse-stdlib -parse-as-library -module-name=main %s -o %t/a.out
+// RUN: %target-build-swift -Xfrontend -disable-availability-checking %import-libdispatch -enable-experimental-feature IsolatedDeinit -parse-stdlib -parse-as-library -module-name=main %s -o %t/a.out
 // RUN: %target-codesign %t/a.out
 // RUN: %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=legacy %target-run %t/a.out | %FileCheck %s
 
diff --git a/test/Distributed/Runtime/distributed_actor_remote_fieldsDontCrashDeinit.swift b/test/Distributed/Runtime/distributed_actor_remote_fieldsDontCrashDeinit.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -disable-availability-checking %S/../Inputs/FakeDistributedActorSystems.swift
-// RUN: %target-build-swift -module-name main  -Xfrontend -disable-availability-checking -j2 -parse-as-library -I %t %s %S/../Inputs/FakeDistributedActorSystems.swift -o %t/a.out
+// RUN: %target-swift-frontend-emit-module -enable-experimental-feature IsolatedDeinit -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -disable-availability-checking %S/../Inputs/FakeDistributedActorSystems.swift
+// RUN: %target-build-swift -module-name main -enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking -j2 -parse-as-library -I %t %s %S/../Inputs/FakeDistributedActorSystems.swift -o %t/a.out
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
diff --git a/test/ModuleInterface/isolated-deinit-compatibility.swift b/test/ModuleInterface/isolated-deinit-compatibility.swift
@@ -1,7 +1,7 @@
-// RUN: %target-swift-frontend -disable-availability-checking -emit-silgen -verify %s
-// RUN: %target-swift-emit-module-interface(%t.swiftinterface) -DEMIT_IFACE %s -disable-availability-checking -module-name IsolatedDeinitCompatibility
-// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -disable-availability-checking -module-name IsolatedDeinitCompatibility
-// RUN: %FileCheck %s < %t.swiftinterface
+// RUN: %target-swift-frontend -enable-experimental-feature IsolatedDeinit -disable-availability-checking -emit-silgen -verify %s
+// RUN: %target-swift-emit-module-interface(%t.swiftinterface) -DEMIT_IFACE %s -enable-experimental-feature IsolatedDeinit -disable-availability-checking -module-name IsolatedDeinitCompatibility
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -enable-experimental-feature IsolatedDeinit -disable-availability-checking -module-name IsolatedDeinitCompatibility
+// RUN: %FileCheck %s --dump-input=always < %t.swiftinterface
 
 // MARK: Sync deinit in class
 
@@ -32,15 +32,6 @@ public class SyncClassDefaultPublic {
 // CHECK: {{(@objc )?}}@_Concurrency.MainActor deinit
 // CHECK-NOT: #
 // CHECK: }
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: public class SyncClassGlobalActorOpen {
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: }
-// CHECK-NOT: #
 // CHECK: #endif
 open class SyncClassGlobalActorOpen {
     @MainActor deinit {}
@@ -52,13 +43,6 @@ open class SyncClassGlobalActorOpen {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}@_Concurrency.MainActor deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 public class SyncClassGlobalActorPublic {
     @MainActor deinit {}
@@ -71,15 +55,6 @@ public class SyncClassGlobalActorPublic {
 // CHECK: {{(@objc )?}}isolated deinit
 // CHECK-NOT: #
 // CHECK: }
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: @_Concurrency.MainActor public class SyncClassIsolatedOpen {
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: }
-// CHECK-NOT: #
 // CHECK: #endif
 @MainActor
 open class SyncClassIsolatedOpen {
@@ -92,13 +67,6 @@ open class SyncClassIsolatedOpen {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}isolated deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 @MainActor
 public class SyncClassIsolatedPublic {
@@ -112,15 +80,6 @@ public class SyncClassIsolatedPublic {
 // CHECK: {{(@objc )?}}nonisolated deinit
 // CHECK-NOT: #
 // CHECK: }
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: @_Concurrency.MainActor public class SyncClassNonisolatedOpen {
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: }
-// CHECK-NOT: #
 // CHECK: #endif
 @MainActor
 open class SyncClassNonisolatedOpen {
@@ -133,13 +92,6 @@ open class SyncClassNonisolatedOpen {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}nonisolated deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 @MainActor
 public class SyncClassNonisolatedPublic {
@@ -164,13 +116,6 @@ public actor SyncActorDefaultPublic {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}@_Concurrency.MainActor deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 public actor SyncActorGlobalActorPublic {
     @MainActor deinit {}
@@ -182,13 +127,6 @@ public actor SyncActorGlobalActorPublic {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}isolated deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 public actor SyncActorIsolatedPublic {
     isolated deinit {}
@@ -200,13 +138,6 @@ public actor SyncActorIsolatedPublic {
 // CHECK: #if {{.*}}$IsolatedDeinit
 // CHECK-NOT: #
 // CHECK: {{(@objc )?}}nonisolated deinit
-// CHECK-NOT: #
-// CHECK: #else
-// CHECK-NOT: #
-// CHECK: {{(@objc )?}}deinit
-// CHECK-NOT: #
-// CHECK: #endif
-// CHECK-NOT: #
 // CHECK: }
 public actor SyncActorNonisolatedPublic {
     nonisolated deinit {}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)`
	`1`	`+// RUN: %target-run-simple-swift( -enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)`
`2`	`2`
`3`	`3`	`// REQUIRES: executable_test`
`4`	`4`	`// REQUIRES: libdispatch`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library) \| %FileCheck %s`
	`1`	`+// RUN: %target-run-simple-swift(-enable-experimental-feature IsolatedDeinit -Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library) \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: executable_test`
`4`	`4`	`// REQUIRES: concurrency`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -verify %s`
	`1`	`+// RUN: %target-swift-frontend -disable-availability-checking -enable-experimental-feature IsolatedDeinit -parse-as-library -emit-silgen -verify %s`
`2`	`2`
`3`	`3`	`@globalActor final actor FirstActor {`
`4`	`4`	`static let shared = FirstActor()`