mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
3439e0caab
use local funcs to implement `defer`, this also fixes several bugs with that feature, such as it breaking in nonisolated functions when a default isolation is in effect in the source file. Change how we compute isolation of local funcs. The rule here is supposed to be that non-`@Sendable` local funcs are isolated the same as their enclosing context. Unlike closure expressions, this is unconditional: in instance-isolated functions, the isolation does not depend on whether `self` is captured. But the computation was wrong: it didn't translate global actor isolation between contexts, it didn't turn parameter isolation into capture isolation, and it fell through for several other kinds of parent isolation, causing the compiler to try to apply default isolation instead. I've extracted the logic from the closure expression path into a common function and used it for both paths. The capture computation logic was forcing a capture of the enclosing isolation in local funcs, but only for async functions. Presumably this was conditional because async functions need the isolation for actor hops, but sync functions don't really need it. However, this was causing crashes with `-enable-actor-data-race-checks`. (I didn't investigate whether it also failed with the similar assertion we do with preconcurrency.) For now, I've switched this to capture the isolated instance unconditionally. If we need to be more conservative by either only capturing when data-race checks are enabled or disabling the checks when the isolation isn't captured, we can look into that. Fix a bug in capture isolation checking. We were ignoring captures of nonisolated declarations in order to implement the rule that permits `nonisolated(unsafe)` variables to be captured in non-sendable closures. This check needs to only apply to variables! The isolation of a local func has nothing to do with its sendability as a capture. That fix exposed a problem where we were being unnecessarily restrictive with generic local func declarations because we didn't consider them to have sendable type. This was true even if the genericity was purely from being declared in a generic context, but it doesn't matter, they ought to be sendable regardless. Finally, fix a handful of bugs where global actor types were not remapped properly in SILGen.
59 lines
1.4 KiB
Swift
59 lines
1.4 KiB
Swift
// RUN: %empty-directory(%t)
|
|
// RUN: split-file %s %t
|
|
|
|
// REQUIRES: concurrency
|
|
// REQUIRES: swift_feature_DefaultIsolationPerFile
|
|
|
|
// RUN: %target-swift-frontend -enable-experimental-feature DefaultIsolationPerFile -emit-sil -swift-version 6 -disable-availability-checking %t/main.swift %t/concurrent.swift | %FileCheck %s
|
|
|
|
//--- main.swift
|
|
|
|
using @MainActor
|
|
|
|
class C {
|
|
// CHECK: // static C.shared.getter
|
|
// CHECK-NEXT: // Isolation: global_actor. type: MainActor
|
|
static let shared = C()
|
|
|
|
// CHECK: // C.init()
|
|
// CHECK-NEXT: // Isolation: global_actor. type: MainActor
|
|
init() {}
|
|
}
|
|
|
|
// CHECK: // test()
|
|
// CHECK-NEXT: // Isolation: global_actor. type: MainActor
|
|
func test() {
|
|
// CHECK: // closure #1 in test()
|
|
// CHECK-NEXT: // Isolation: nonisolated
|
|
Task.detached {
|
|
let s = S(value: 0)
|
|
}
|
|
}
|
|
|
|
// Tested below. This used to fail in default-isolation mode because
|
|
// the type-checker applied the default isolation to the implicit $defer
|
|
// function, causing it to have MainActor isolation despite the enclosing
|
|
// context being nonisolated.
|
|
nonisolated func test_defer() {
|
|
defer {}
|
|
}
|
|
|
|
//--- concurrent.swift
|
|
|
|
using nonisolated
|
|
|
|
// CHECK: // S.init(value:)
|
|
// CHECK-NEXT: // Isolation: unspecified
|
|
struct S {
|
|
var value: Int
|
|
}
|
|
|
|
// CHECK: // test_defer()
|
|
// CHECK-NEXT: // Isolation: nonisolated
|
|
|
|
// CHECK: // $defer #1 () in test_defer()
|
|
// CHECK-NEXT: // Isolation: nonisolated
|
|
|
|
// CHECK: // S.value.getter
|
|
// CHECK-NEXT: // Isolation: unspecified
|