Skip to content

[6.2] [SE-0466] Infer isolated deinit in main-actor-by-default mode #82670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2025
Merged

[6.2] [SE-0466] Infer isolated deinit in main-actor-by-default mode #82670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/Sema/TypeCheckConcurrency.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6051,10 +6051,9 @@ computeDefaultInferredActorIsolation(ValueDecl *value) {
sendableConformanceRequiresNonisolated(nominalTypeDecl))
return { };

// FIXME: deinit should be implicitly MainActor too.
if (isa<TypeDecl>(value) || isa<ExtensionDecl>(value) ||
isa<AbstractStorageDecl>(value) || isa<FuncDecl>(value) ||
isa<ConstructorDecl>(value)) {
isa<AbstractStorageDecl>(value) ||
isa<AbstractFunctionDecl>(value)) {
// Preconcurrency here is used to stage the diagnostics
// when users select `@MainActor` default isolation with
// non-strict concurrency modes (pre Swift 6).
Expand Down
13 changes: 12 additions & 1 deletion test/Concurrency/assume_mainactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
class Klass {
// Implicit deinit
// CHECK: // Klass.deinit
// CHECK-NEXT: // Isolation: unspecified
// CHECK-NEXT: // Isolation: global_actor. type: MainActor
// CHECK-NEXT: sil hidden [ossa] @$s16assume_mainactor5KlassCfd : $@convention(method) (@guaranteed Klass) -> @owned Builtin.NativeObject {

// Implicit deallocating deinit
// CHECK: // Klass.__deallocating_deinit
// CHECK-NEXT: // Isolation: nonisolated
// CHECK-NEXT: sil hidden [ossa] @$s16assume_mainactor5KlassCfD : $@convention(method) (@owned Klass) -> () {
// CHECK: swift_task_deinitOnExecutor

// Implicit allocating init
// CHECK: // Klass.__allocating_init()
Expand Down Expand Up @@ -66,6 +67,16 @@ struct NonIsolatedStructContainingKlass {
// CHECK-NEXT: sil hidden [ossa] @$s16assume_mainactor32NonIsolatedStructContainingKlassVACycfC : $@convention(method) (@thin NonIsolatedStructContainingKlass.Type) -> @owned NonIsolatedStructContainingKlass {
}

struct NonCopyableStruct: ~Copyable {
var x: Int
var y: Int

// CHECK: NonCopyableStruct.deinit
// CHECK-NEXT: Isolation: nonisolated
deinit {
}
}

@globalActor
actor CustomActor {
static nonisolated let shared = CustomActor()
Expand Down