[AST/Sema/SIL] Implement @_inheritActorContext(always)
#81496
Conversation
xedin
requested review from
jckarter,
ktoso,
ahoppen,
bnbarham,
CodaFi,
hamishknight,
rintaro,
xymus,
hborla,
slavapestov and
DougGregor
as code owners
| auto isolation = closure->getActorIsolation(); | ||
| if (isolation.isActorInstanceIsolated()) { | ||
| if (auto *var = isolation.getActorInstance()) { | ||
| recordCapture(CapturedValue(var, /*flags=*/0, SourceLoc())); |
There was a problem hiding this comment.
@slavapestov Maybe you have a better idea how to handle this? I don't think we can do this in Sema because we don't have isolation when we compute captures.
| diag::inherit_actor_context_only_on_async_or_isolation_erased_params, | ||
| attr) | ||
| .warnUntilFutureSwiftVersion(); | ||
| } |
|
|
||
| acceptAsyncSendableClosureInheritingAlways { | ||
| v += 1 // Ok | ||
| } | ||
| } |
There was a problem hiding this comment.
Minor followup: Would it be worth adding a test for @MainActor as well, it'll "just work" because _inheritActorContext itself should be doing that, but in order make sure we don't accidentally regress that in _inheritActorContext(always) somehow?
There was a problem hiding this comment.
Ah the diff had hidden the testGlobalActorInheritance case, we got that covered then 👍
|
@swift-ci please test |
|
@swift-ci please test macOS platform |
…lways` modifier By default (currently) the closure passed to a parameter with `@_inheritActorContext` would only inherit isolation from `nonisolated`, global actor isolated or actor context when "self" is captured by the closure. `always` changes this behavior to always inherit actor isolation from context regardless of whether it's captured or not.
…feature flag This is going to avoid condfails when declarations are printed in the swiftinterface files.
…th an optional modifier
… lowering captures `getLoweredLocalCaptures` seems the best place to do it because during Sema there is a chicken and an egg situation where isolation depends on captures and in this case captures depend on isolation.
…le`/sending and async/`@isolated(any)` parameters
xedin
force-pushed
the
inheritActorContext-always
branch
from
8c9b8a7 to
17b8f7e
Compare
|
@swift-ci please test |
| @@ -1210,6 +1210,8 @@ actor MyServer : Server { | |||
| func acceptAsyncSendableClosure<T>(_: @Sendable () async -> T) { } | |||
| @available(SwiftStdlib 5.1, *) | |||
| func acceptAsyncSendableClosureInheriting<T>(@_inheritActorContext _: @Sendable () async -> T) { } | |||
| @available(SwiftStdlib 5.1, *) | |||
| func acceptAsyncSendableClosureInheritingAlways<T>(@_inheritActorContext(always) _: @Sendable () async -> T) { } | |||
There was a problem hiding this comment.
out of curiosity, how is this change expected to behave if the isolated parameter is shadowed and captured? e.g.
func isofn(_ iso: isolated any Actor) {
// or shadow locally here and capture
inheritAlways { [iso] in ... }
}There was a problem hiding this comment.
It should behave the same as non-always version does - determineClosureIsolation is going to check whether capture is a isolated parameter and act accordingly, if it’s not - “always” is going to force the capture without shadowing based on isolation of context.
@_inheritActorContextattribute to support optionalalwaysmodifier. The new modifier will make closure context isolated even if the parameter is not captured by the closure.@_inheritActorContextattribute validation - it could only be used on parameter that have@Sendableorsendingand@isolated(any)orasyncfunction type (downgraded to a warning until future major Swift mode to avoid source compatibility issues).@_inheritActorContext(always)in swift interface filesgetLoweredLocalCapturesto add an entry for isolation parameter implicitly captured by@_inheritActorContext(always)alwaysmodifier