Skip to content

Switch #isolation from AnyActor to Actor #71011

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 2 commits into from
Jan 19, 2024
Merged

Switch #isolation from AnyActor to Actor #71011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24c2d1a
Switch `#isolation` from `AnyActor` to `Actor`
DougGregor Jan 17, 2024
8d67a37
Only declare `isolation` macro when the compiler supports macros
DougGregor Jan 19, 2024
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
2 changes: 1 addition & 1 deletion lib/Sema/CSGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3916,7 +3916,7 @@ namespace {

Type visitCurrentContextIsolationExpr(CurrentContextIsolationExpr *E) {
auto actorProto = CS.getASTContext().getProtocol(
KnownProtocolKind::AnyActor);
KnownProtocolKind::Actor);
return OptionalType::get(actorProto->getDeclaredExistentialType());
}

Expand Down
5 changes: 4 additions & 1 deletion stdlib/public/Concurrency/Actor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ public func _defaultActorDestroy(_ actor: AnyObject)
@usableFromInline
internal func _enqueueOnMain(_ job: UnownedJob)

#if $Macros
/// Produce a reference to the actor to which the enclosing code is
/// isolated, or `nil` if the code is nonisolated.
@available(SwiftStdlib 5.1, *)
@freestanding(expression)
public macro isolation() -> (any AnyActor)? = Builtin.IsolationMacro
public macro isolation() -> (any Actor)? = Builtin.IsolationMacro
#endif