Skip to content

Commit e681ae4

Browse files
committed
[Distributed] make witness be the distributed thunk
1 parent f4d4899 commit e681ae4

16 files changed

+366
-31
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4817,6 +4817,9 @@ ERROR(distributed_actor_func_static,none,
48174817
ERROR(distributed_actor_func_not_in_distributed_actor,none,
48184818
"'distributed' method can only be declared within 'distributed actor'",
48194819
())
4820+
ERROR(distributed_method_requirement_must_be_async_throws,none, // FIXME(distributed): this is an implementation limitation we should lift
4821+
"'distributed' protocol requirement %0 must currently be declared explicitly 'async throws'",
4822+
(DeclName))
48204823
ERROR(distributed_actor_user_defined_special_property,none,
48214824
"property %0 cannot be defined explicitly, as it conflicts with "
48224825
"distributed actor synthesized stored property",

include/swift/AST/DistributedDecl.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ Type getDistributedActorSystemType(NominalTypeDecl *actor);
5050
/// Determine the `ID` type for the given actor.
5151
Type getDistributedActorIDType(NominalTypeDecl *actor);
5252

53+
/// Similar to `getDistributedSerializationRequirementType`, however, from the
54+
/// perspective of a concrete function. This way we're able to get the
55+
/// serialization requirement for specific members, also in protocols.
56+
Type getConcreteReplacementForMemberSerializationRequirement(ValueDecl *member);
57+
5358
/// Get specific 'SerializationRequirement' as defined in 'nominal'
5459
/// type, which must conform to the passed 'protocol' which is expected
5560
/// to require the 'SerializationRequirement'.

include/swift/SIL/SILDeclRef.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,7 @@ struct SILDeclRef {
414414
defaultArgIndex,
415415
pointer.get<AutoDiffDerivativeFunctionIdentifier *>());
416416
}
417-
/// Returns the distributed entry point corresponding to the same
418-
/// decl.
417+
/// Returns the distributed entry point corresponding to the same decl.
419418
SILDeclRef asDistributed(bool distributed = true) const {
420419
return SILDeclRef(loc.getOpaqueValue(), kind,
421420
/*foreign=*/false,

lib/AST/DistributedDecl.cpp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,37 @@ Type swift::getConcreteReplacementForProtocolActorSystemType(ValueDecl *member)
136136
llvm_unreachable("Unable to fetch ActorSystem type!");
137137
}
138138

139+
Type swift::getConcreteReplacementForMemberSerializationRequirement(
140+
ValueDecl *member) {
141+
auto &C = member->getASTContext();
142+
auto *DC = member->getDeclContext();
143+
auto DA = C.getDistributedActorDecl();
144+
145+
// === When declared inside an actor, we can get the type directly
146+
if (auto classDecl = DC->getSelfClassDecl()) {
147+
return getDistributedSerializationRequirementType(classDecl, C.getDistributedActorDecl());
148+
}
149+
150+
/// === Maybe the value is declared in a protocol?
151+
if (auto protocol = DC->getSelfProtocolDecl()) {
152+
GenericSignature signature;
153+
if (auto *genericContext = member->getAsGenericContext()) {
154+
signature = genericContext->getGenericSignature();
155+
} else {
156+
signature = DC->getGenericSignatureOfContext();
157+
}
158+
159+
auto SerReqAssocType = DA->getAssociatedType(C.Id_SerializationRequirement)
160+
->getDeclaredInterfaceType();
161+
162+
// Note that this may be null, e.g. if we're a distributed func inside
163+
// a protocol that did not declare a specific actor system requirement.
164+
return signature->getConcreteType(SerReqAssocType);
165+
}
166+
167+
llvm_unreachable("Unable to fetch ActorSystem type!");
168+
}
169+
139170
Type swift::getDistributedActorSystemType(NominalTypeDecl *actor) {
140171
assert(!dyn_cast<ProtocolDecl>(actor) &&
141172
"Use getConcreteReplacementForProtocolActorSystemType instead to get"

lib/SILGen/SILGenPoly.cpp

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4435,15 +4435,22 @@ void SILGenFunction::emitProtocolWitness(
44354435
SmallVector<ManagedValue, 8> origParams;
44364436
collectThunkParams(loc, origParams);
44374437

4438-
// If the witness is isolated to a distributed actor, but the requirement is
4439-
// not, go through the distributed thunk.
44404438
if (witness.hasDecl() &&
4441-
getActorIsolation(witness.getDecl()).isDistributedActor() &&
4442-
requirement.hasDecl() &&
4443-
!getActorIsolation(requirement.getDecl()).isDistributedActor()) {
4444-
witness = SILDeclRef(
4445-
cast<AbstractFunctionDecl>(witness.getDecl())->getDistributedThunk())
4446-
.asDistributed();
4439+
getActorIsolation(witness.getDecl()).isDistributedActor()) {
4440+
// We witness protocol requirements using the distributed thunk, when:
4441+
// - the witness is isolated to a distributed actor, but the requirement is not
4442+
// - the requirement is a distributed func, and therefore can only be witnessed
4443+
// by a distributed func; we handle this by witnessing the requirement with the thunk
4444+
// FIXME(distributed): this limits us to only allow distributed explicitly throwing async requirements... we need to fix this somehow.
4445+
if (requirement.hasDecl()) {
4446+
if ((!getActorIsolation(requirement.getDecl()).isDistributedActor()) ||
4447+
(isa<FuncDecl>(requirement.getDecl()) &&
4448+
witness.getFuncDecl()->isDistributed())) {
4449+
auto thunk = cast<AbstractFunctionDecl>(witness.getDecl())
4450+
->getDistributedThunk();
4451+
witness = SILDeclRef(thunk).asDistributed();
4452+
}
4453+
}
44474454
} else if (enterIsolation) {
44484455
// If we are supposed to enter the actor, do so now by hopping to the
44494456
// actor.

lib/Sema/CodeSynthesisDistributedActor.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,13 @@ static FuncDecl *createDistributedThunkFunction(FuncDecl *func) {
613613
auto &C = func->getASTContext();
614614
auto DC = func->getDeclContext();
615615

616-
auto systemTy = getConcreteReplacementForProtocolActorSystemType(func);
617-
assert(systemTy &&
616+
// NOTE: So we don't need a thunk in the protocol, we should call the underlying
617+
// thing instead, which MUST have a thunk, since it must be a distributed func as well...
618+
if (dyn_cast<ProtocolDecl>(DC)) {
619+
return nullptr;
620+
}
621+
622+
assert(getConcreteReplacementForProtocolActorSystemType(func) &&
618623
"Thunk synthesis must have concrete actor system type available");
619624

620625
DeclName thunkName = func->getName();

lib/Sema/TypeCheckAttr.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5783,6 +5783,7 @@ void AttributeChecker::visitDistributedActorAttr(DistributedActorAttr *attr) {
57835783

57845784
// distributed func must be declared inside an distributed actor
57855785
auto selfTy = dc->getSelfTypeInContext();
5786+
57865787
if (!selfTy->isDistributedActor()) {
57875788
auto diagnostic = diagnoseAndRemoveAttr(
57885789
attr, diag::distributed_actor_func_not_in_distributed_actor);
@@ -5793,6 +5794,24 @@ void AttributeChecker::visitDistributedActorAttr(DistributedActorAttr *attr) {
57935794
}
57945795
return;
57955796
}
5797+
5798+
// Diagnose for the limitation that we currently have to require distributed
5799+
// actor constrained protocols to declare the distributed requirements as
5800+
// 'async throws'
5801+
// FIXME: rdar://95949498 allow requirements to not declare explicit async/throws in protocols; those effects are implicit in any case
5802+
if (isa<ProtocolDecl>(dc)) {
5803+
if (!funcDecl->hasAsync() || !funcDecl->hasThrows()) {
5804+
auto diag = funcDecl->diagnose(diag::distributed_method_requirement_must_be_async_throws,
5805+
funcDecl->getName());
5806+
if (!funcDecl->hasAsync()) {
5807+
diag.fixItInsertAfter(funcDecl->getThrowsLoc(), " async");
5808+
}
5809+
if (!funcDecl->hasThrows()) {
5810+
diag.fixItInsertAfter(funcDecl->getThrowsLoc(), " throws");
5811+
}
5812+
return;
5813+
}
5814+
}
57965815
}
57975816
}
57985817

lib/Sema/TypeCheckDistributed.cpp

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,25 @@ bool CheckDistributedFunctionRequest::evaluate(
502502
serializationRequirements = getDistributedSerializationRequirementProtocols(
503503
getDistributedActorSystemType(actor)->getAnyNominal(),
504504
C.getProtocol(KnownProtocolKind::DistributedActorSystem));
505+
} else if (isa<ProtocolDecl>(DC)) {
506+
if (auto seqReqTy =
507+
getConcreteReplacementForMemberSerializationRequirement(func)) {
508+
auto seqReqTyDes = seqReqTy->castTo<ExistentialType>()->getConstraintType()->getDesugaredType();
509+
for (auto req : flattenDistributedSerializationTypeToRequiredProtocols(seqReqTyDes)) {
510+
serializationRequirements.insert(req);
511+
}
512+
}
513+
514+
// The distributed actor constrained protocol has no serialization requirements
515+
// or actor system defined, so these will only be enforced, by implementations
516+
// of DAs conforming to it, skip checks here.
517+
if (serializationRequirements.empty()) {
518+
return false;
519+
}
505520
} else {
506-
llvm_unreachable("Cannot handle types other than extensions and actor "
507-
"declarations in distributed function checking.");
521+
llvm_unreachable("Distributed function detected in type other than extension, "
522+
"distributed actor, or protocol! This should not be possible "
523+
", please file a bug.");
508524
}
509525

510526
// If the requirement is exactly `Codable` we diagnose it ia bit nicer.
@@ -652,12 +668,23 @@ void TypeChecker::checkDistributedActor(SourceFile *SF, NominalTypeDecl *nominal
652668
// If applicable, this will create the default 'init(transport:)' initializer
653669
(void)nominal->getDefaultInitializer();
654670

671+
655672
for (auto member : nominal->getMembers()) {
656673
// --- Ensure all thunks
657674
if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
658675
if (!func->isDistributed())
659676
continue;
660677

678+
if (!isa<ProtocolDecl>(nominal)) {
679+
auto systemTy = getConcreteReplacementForProtocolActorSystemType(func);
680+
if (!systemTy || systemTy->hasError()) {
681+
nominal->diagnose(
682+
diag::distributed_actor_conformance_missing_system_type,
683+
nominal->getName());
684+
return;
685+
}
686+
}
687+
661688
if (auto thunk = func->getDistributedThunk()) {
662689
SF->DelayedFunctions.push_back(thunk);
663690
}
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -disable-availability-checking %S/../Inputs/FakeDistributedActorSystems.swift
3+
// 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
4+
// RUN: %target-run %t/a.out | %FileCheck %s --color --dump-input=always
5+
6+
// REQUIRES: executable_test
7+
// REQUIRES: concurrency
8+
// REQUIRES: distributed
9+
10+
// rdar://76038845
11+
// UNSUPPORTED: use_os_stdlib
12+
// UNSUPPORTED: back_deployment_runtime
13+
14+
// FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574
15+
// UNSUPPORTED: OS=windows-msvc
16+
17+
import Distributed
18+
import FakeDistributedActorSystems
19+
20+
21+
typealias DefaultDistributedActorSystem = FakeRoundtripActorSystem
22+
23+
protocol DistributedWorker: DistributedActor where ActorSystem == DefaultDistributedActorSystem {
24+
associatedtype WorkItem: Sendable & Codable
25+
associatedtype WorkResult: Sendable & Codable
26+
27+
// distributed requirement currently is forced to be `async throws`...
28+
// FIXME(distributed): requirements don't have to be async throws,
29+
// distributed makes them implicitly async throws anyway...
30+
distributed func submit(work: WorkItem) async throws -> WorkResult
31+
32+
// non distributed requirements can be witnessed with _normal_ functions
33+
func sync(work: WorkItem) -> WorkResult
34+
func async(work: WorkItem) async -> WorkResult
35+
func syncThrows(work: WorkItem) throws -> WorkResult
36+
func asyncThrows(work: WorkItem) async throws -> WorkResult
37+
}
38+
39+
distributed actor TheWorker: DistributedWorker {
40+
typealias ActorSystem = DefaultDistributedActorSystem
41+
typealias WorkItem = String
42+
typealias WorkResult = String
43+
44+
distributed func submit(work: WorkItem) async throws -> WorkResult {
45+
"\(#function): \(work)"
46+
}
47+
48+
func sync(work: WorkItem) -> WorkResult {
49+
return "\(#function): \(work)"
50+
}
51+
func async(work: WorkItem) async -> WorkResult {
52+
return "\(#function): \(work)"
53+
}
54+
func syncThrows(work: WorkItem) throws -> WorkResult {
55+
return "\(#function): \(work)"
56+
}
57+
func asyncThrows(work: WorkItem) async throws -> WorkResult {
58+
return "\(#function): \(work)"
59+
}
60+
}
61+
62+
func test_generic(system: DefaultDistributedActorSystem) async throws {
63+
let localW = TheWorker(actorSystem: system)
64+
let remoteW = try! TheWorker.resolve(id: localW.id, using: system)
65+
precondition(__isRemoteActor(remoteW))
66+
67+
// direct calls work ok:
68+
let replyDirect = try await remoteW.submit(work: "Direct")
69+
print("reply direct: \(replyDirect)")
70+
// CHECK: >> remoteCall: on:main.TheWorker, target:main.TheWorker.submit(work:), invocation:FakeInvocationEncoder(genericSubs: [], arguments: ["Direct"], returnType: Optional(Swift.String), errorType: Optional(Swift.Error)), throwing:Swift.Error, returning:Swift.String
71+
// CHECK: reply direct: submit(work:): Direct
72+
73+
func callWorker<W: DistributedWorker>(w: W) async throws -> String where W.WorkItem == String, W.WorkResult == String {
74+
try await w.submit(work: "Hello")
75+
}
76+
let reply = try await callWorker(w: remoteW)
77+
print("reply (remote): \(reply)")
78+
// CHECK: >> remoteCall: on:main.TheWorker, target:main.TheWorker.submit(work:), invocation:FakeInvocationEncoder(genericSubs: [], arguments: ["Hello"], returnType: Optional(Swift.String), errorType: Optional(Swift.Error)), throwing:Swift.Error, returning:Swift.String
79+
// CHECK: << remoteCall return: submit(work:): Hello
80+
// CHECK: reply (remote): submit(work:): Hello
81+
82+
let replyLocal = try await callWorker(w: localW)
83+
print("reply (local): \(replyLocal)")
84+
// CHECK-NOT: >> remoteCall
85+
// CHECK: reply (local): submit(work:): Hello
86+
}
87+
88+
func test_whenLocal(system: DefaultDistributedActorSystem) async throws {
89+
let localW = TheWorker(actorSystem: system)
90+
let remoteW = try! TheWorker.resolve(id: localW.id, using: system)
91+
precondition(__isRemoteActor(remoteW))
92+
93+
do {
94+
let replySync = await remoteW.whenLocal { __secretlyKnownToBeLocal in
95+
__secretlyKnownToBeLocal.sync(work: "test")
96+
}
97+
print("replySync (remote): \(replySync)")
98+
// CHECK: replySync (remote): nil
99+
100+
let replySyncThrows = try await remoteW.whenLocal { __secretlyKnownToBeLocal in
101+
try __secretlyKnownToBeLocal.syncThrows(work: "test")
102+
}
103+
print("replySyncThrows (remote): \(replySyncThrows)")
104+
// CHECK: replySyncThrows (remote): nil
105+
106+
let replyAsync = await remoteW.whenLocal { __secretlyKnownToBeLocal in
107+
await __secretlyKnownToBeLocal.async(work: "test")
108+
}
109+
print("replyAsync (remote): \(replyAsync)")
110+
// CHECK: replyAsync (remote): nil
111+
112+
let replyAsyncThrows = try await remoteW.whenLocal { __secretlyKnownToBeLocal in
113+
try await __secretlyKnownToBeLocal.asyncThrows(work: "test")
114+
}
115+
print("replyAsyncThrows (remote): \(replyAsyncThrows)")
116+
// CHECK: replyAsyncThrows (remote): nil
117+
}
118+
// ==== ----------------------------------------------------------------------
119+
120+
do {
121+
let replyDistSubmit = try await localW.whenLocal { __secretlyKnownToBeLocal in
122+
try await __secretlyKnownToBeLocal.submit(work: "local-test")
123+
}
124+
print("replyDistSubmit (local): \(replyDistSubmit ?? "nil")")
125+
// CHECK-NOT: >> remoteCall
126+
// CHECK: replyDistSubmit (local): submit(work:): local-test
127+
128+
let replySyncLocal = await localW.whenLocal { __secretlyKnownToBeLocal in
129+
__secretlyKnownToBeLocal.sync(work: "local-test")
130+
}
131+
print("replySyncLocal (local): \(replySyncLocal ?? "nil")")
132+
// CHECK-NOT: >> remoteCall
133+
// CHECK: replySyncLocal (local): sync(work:): local-test
134+
135+
let replySyncThrowsLocal = try await localW.whenLocal { __secretlyKnownToBeLocal in
136+
try __secretlyKnownToBeLocal.syncThrows(work: "local-test")
137+
}
138+
print("replySyncThrowsLocal (local): \(replySyncThrowsLocal ?? "nil")")
139+
// CHECK-NOT: >> remoteCall
140+
// CHECK: replySyncThrowsLocal (local): syncThrows(work:): local-test
141+
142+
let replyAsyncLocal = await localW.whenLocal { __secretlyKnownToBeLocal in
143+
await __secretlyKnownToBeLocal.async(work: "local-test")
144+
}
145+
print("replyAsyncLocal (local): \(replyAsyncLocal ?? "nil")")
146+
// CHECK-NOT: >> remoteCall
147+
// CHECK: replyAsyncLocal (local): async(work:): local-test
148+
149+
let replyAsyncThrowsLocal = try await localW.whenLocal { __secretlyKnownToBeLocal in
150+
try await __secretlyKnownToBeLocal.asyncThrows(work: "local-test")
151+
}
152+
print("replyAsyncThrowsLocal (local): \(replyAsyncThrowsLocal ?? "nil")")
153+
// CHECK-NOT: >> remoteCall
154+
// CHECK: replyAsyncThrowsLocal (local): asyncThrows(work:): local-test
155+
}
156+
}
157+
158+
@main struct Main {
159+
static func main() async {
160+
let system = DefaultDistributedActorSystem()
161+
try! await test_generic(system: system)
162+
print("==== ---------------------------------------------------")
163+
try! await test_whenLocal(system: system)
164+
}
165+
}

0 commit comments

Comments
 (0)