Skip to content

Commit ad346ae

Browse files
committed
[Distributed] re-disable distributed/runtime tests to land initial work
1 parent 829a5d6 commit ad346ae

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

lib/SILGen/SILGenDistributed.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ static void emitDistributedActorStore_init_assignIdentity(
256256
auto *module = SGF.getModule().getSwiftModule();
257257

258258
// the conformance here is just an abstract thing so we can simplify
259-
// auto transportConfRef = module->lookupConformance(
260-
// openedTransportType, transportProto);
261259
auto transportConfRef = ProtocolConformanceRef(transportProto);
262260
assert(!transportConfRef.isInvalid() && "Missing conformance to `ActorTransport`");
263261

@@ -415,8 +413,6 @@ void SILGenFunction::emitDistributedActorReady(
415413
auto *module = getModule().getSwiftModule();
416414

417415
// the conformance here is just an abstract thing so we can simplify
418-
// auto transportConfRef = module->lookupConformance(
419-
// openedTransportType, transportProto);
420416
auto transportConfRef = ProtocolConformanceRef(transportProto);
421417
assert(!transportConfRef.isInvalid() && "Missing conformance to `ActorTransport`");
422418

@@ -487,10 +483,9 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) {
487483
transportArg->getType().getASTType()->isEqual(C.getActorTransportType()));
488484

489485
// --- Parameter: self
490-
// ClassDecl *selfDecl = cast<ClassDecl>(fd->getDeclContext()->getAsDecl());
491486
auto *selfTyDecl = fd->getParent()->getSelfNominalTypeDecl();
492487
assert(selfTyDecl->isDistributedActor());
493-
auto selfTy = F.mapTypeIntoContext(selfTyDecl->getDeclaredInterfaceType()); // TODO: thats just self var devl getType
488+
auto selfTy = F.mapTypeIntoContext(selfTyDecl->getDeclaredInterfaceType());
494489

495490
// ManagedValue selfArg = B.createInputFunctionArgument(selfTy, selfDecl);
496491
VarDecl *selfVarDecl = fd->getImplicitSelfDecl();
@@ -824,6 +819,8 @@ void SILGenFunction::emitDistributedThunk(SILDeclRef thunk) {
824819
}
825820
}
826821

822+
// TODO: to use a emitAndBranch local function, since these four blocks are so similar
823+
827824
{
828825
B.emitBlock(remoteErrorBB);
829826
SILValue error = remoteErrorBB->createPhiArgument(

test/Distributed/Runtime/distributed_actor_isRemote.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// UNSUPPORTED: use_os_stdlib
99
// UNSUPPORTED: back_deployment_runtime
1010

11-
// RE_QUIRES: rdar78290608
11+
// REQUIRES: rdar78290608
1212

1313
import _Distributed
1414

test/Distributed/Runtime/distributed_actor_remote_fieldsDontCrashDeinit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// UNSUPPORTED: use_os_stdlib
99
// UNSUPPORTED: back_deployment_runtime
1010

11-
// RE_QUIRES: rdar78290608
11+
// REQUIRES: rdar78290608
1212

1313
import _Distributed
1414

test/Distributed/Runtime/distributed_actor_remote_retains_transport.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// UNSUPPORTED: use_os_stdlib
99
// UNSUPPORTED: back_deployment_runtime
1010

11-
// RE_QUIRES: rdar78290608
11+
// REQUIRES: rdar78290608
1212

1313
import _Distributed
1414

test/SIL/Distributed/distributed_actor_default_deinit_sil.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ distributed actor SimpleEmptyDistributedActor {
1010
// ==== deinit must invoke transport.resignIdentity() when it is local
1111

1212
// CHECK: // SimpleEmptyDistributedActor.deinit
13-
// CHECK: sil hidden [available 12.0] @$s36distributed_actor_default_deinit_sil27SimpleEmptyDistributedActorCfd : $@convention(method) (@guaranteed SimpleEmptyDistributedActor) -> @owned Builtin.NativeObject {
13+
// sil hidden [available 12.0] @$s36distributed_actor_default_deinit_sil27SimpleEmptyDistributedActorCfd : $@convention(method) (@guaranteed SimpleEmptyDistributedActor) -> @owned Builtin.NativeObject {
1414
// CHECK: [[SELF:%[0-9]+]] "self"
1515
// CHECK: bb0(%0 : $SimpleEmptyDistributedActor):
1616
// CHECK: debug_value %0 : $SimpleEmptyDistributedActor, let, name "self", argno 1

0 commit comments

Comments
 (0)