Skip to content

Commit 6caeecd

Browse files
committed
fix locating constructor
1 parent 7718448 commit 6caeecd

File tree

3 files changed

+17
-20
lines changed

3 files changed

+17
-20
lines changed

lib/Sema/TypeCheckDistributed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,13 +721,13 @@ GetDistributedRemoteCallTargetInitFunctionRequest::evaluate(
721721
if (params->size() != 1)
722722
return nullptr;
723723

724-
if (params->get(0)->getArgumentName() == C.getIdentifier("_mangledName"))
724+
// _ identifier
725+
if (params->get(0)->getArgumentName().empty())
725726
return ctor;
726727

727728
return nullptr;
728729
}
729730

730-
// TODO(distributed): make a Request for it?
731731
return nullptr;
732732
}
733733

stdlib/public/Distributed/DistributedActorSystem.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,7 @@ extension DistributedActorSystem {
185185
// pretty formatted name of the call target, but perhaps we can do better.
186186

187187
// Get the expected parameter count of the func
188-
guard let targetName = target.identifier else {
189-
throw ExecuteDistributedTargetError(
190-
message: "Unable to extract target identifier from remote call target: \(target)")
191-
}
188+
let targetName = target.identifier
192189
let nameUTF8 = Array(targetName.utf8)
193190

194191
// Gen the generic environment (if any) associated with the target.
@@ -351,7 +348,7 @@ public struct RemoteCallTarget: CustomStringConvertible {
351348
}
352349

353350
/// The underlying identifier of the target, returned as-is.
354-
public var identifier: String? {
351+
public var identifier: String {
355352
return _identifier
356353
}
357354

test/Distributed/Runtime/distributed_actor_remoteCall.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -304,39 +304,39 @@ func test() async throws {
304304

305305
try await system.executeDistributedTarget(
306306
on: local,
307-
target: RemoteCallTarget(_mangledName: emptyName),
307+
target: RemoteCallTarget(emptyName),
308308
invocationDecoder: &emptyInvocation,
309309
handler: FakeResultHandler()
310310
)
311311
// CHECK: RETURN: ()
312312

313313
try await system.executeDistributedTarget(
314314
on: local,
315-
target: RemoteCallTarget(_mangledName: helloName),
315+
target: RemoteCallTarget(helloName),
316316
invocationDecoder: &emptyInvocation,
317317
handler: FakeResultHandler()
318318
)
319319
// CHECK: RETURN: Hello, World!
320320

321321
try await system.executeDistributedTarget(
322322
on: local,
323-
target: RemoteCallTarget(_mangledName: answerName),
323+
target: RemoteCallTarget(answerName),
324324
invocationDecoder: &emptyInvocation,
325325
handler: FakeResultHandler()
326326
)
327327
// CHECK: RETURN: 42
328328

329329
try await system.executeDistributedTarget(
330330
on: local,
331-
target: RemoteCallTarget(_mangledName: largeResultName),
331+
target: RemoteCallTarget(largeResultName),
332332
invocationDecoder: &emptyInvocation,
333333
handler: FakeResultHandler()
334334
)
335335
// CHECK: RETURN: LargeStruct(q: "question", a: 42, b: 1, c: 2.0, d: "Lorum ipsum")
336336

337337
try await system.executeDistributedTarget(
338338
on: local,
339-
target: RemoteCallTarget(_mangledName: enumResultName),
339+
target: RemoteCallTarget(enumResultName),
340340
invocationDecoder: &emptyInvocation,
341341
handler: FakeResultHandler()
342342
)
@@ -350,7 +350,7 @@ func test() async throws {
350350
var echoDecoder = echoInvocation.makeDecoder()
351351
try await system.executeDistributedTarget(
352352
on: local,
353-
target: RemoteCallTarget(_mangledName: echoName),
353+
target: RemoteCallTarget(echoName),
354354
invocationDecoder: &echoDecoder,
355355
handler: FakeResultHandler()
356356
)
@@ -365,7 +365,7 @@ func test() async throws {
365365
var generic1Decoder = generic1Invocation.makeDecoder()
366366
try await system.executeDistributedTarget(
367367
on: local,
368-
target: RemoteCallTarget(_mangledName: generic1Name),
368+
target: RemoteCallTarget(generic1Name),
369369
invocationDecoder: &generic1Decoder,
370370
handler: FakeResultHandler()
371371
)
@@ -383,7 +383,7 @@ func test() async throws {
383383
var generic2Decoder = generic2Invocation.makeDecoder()
384384
try await system.executeDistributedTarget(
385385
on: local,
386-
target: RemoteCallTarget(_mangledName: generic2Name),
386+
target: RemoteCallTarget(generic2Name),
387387
invocationDecoder: &generic2Decoder,
388388
handler: FakeResultHandler()
389389
)
@@ -404,7 +404,7 @@ func test() async throws {
404404
var generic3Decoder = generic3Invocation.makeDecoder()
405405
try await system.executeDistributedTarget(
406406
on: local,
407-
target: RemoteCallTarget(_mangledName: generic3Name),
407+
target: RemoteCallTarget(generic3Name),
408408
invocationDecoder: &generic3Decoder,
409409
handler: FakeResultHandler()
410410
)
@@ -426,7 +426,7 @@ func test() async throws {
426426
var generic4Decoder = generic4Invocation.makeDecoder()
427427
try await system.executeDistributedTarget(
428428
on: local,
429-
target: RemoteCallTarget(_mangledName: generic4Name),
429+
target: RemoteCallTarget(generic4Name),
430430
invocationDecoder: &generic4Decoder,
431431
handler: FakeResultHandler()
432432
)
@@ -450,7 +450,7 @@ func test() async throws {
450450
var generic5Decoder = generic5Invocation.makeDecoder()
451451
try await system.executeDistributedTarget(
452452
on: local,
453-
target: RemoteCallTarget(_mangledName: generic5Name),
453+
target: RemoteCallTarget(generic5Name),
454454
invocationDecoder: &generic5Decoder,
455455
handler: FakeResultHandler()
456456
)
@@ -473,7 +473,7 @@ func test() async throws {
473473
var genericOptDecoder = genericOptInvocation.makeDecoder()
474474
try await system.executeDistributedTarget(
475475
on: local,
476-
target: RemoteCallTarget(_mangledName: genericOptionalName),
476+
target: RemoteCallTarget(genericOptionalName),
477477
invocationDecoder: &genericOptDecoder,
478478
handler: FakeResultHandler()
479479
)
@@ -488,7 +488,7 @@ func test() async throws {
488488
var decodeErrDecoder = decodeErrInvocation.makeDecoder()
489489
try await system.executeDistributedTarget(
490490
on: local,
491-
target: RemoteCallTarget(_mangledName: expectsDecodeErrorName),
491+
target: RemoteCallTarget(expectsDecodeErrorName),
492492
invocationDecoder: &decodeErrDecoder,
493493
handler: FakeResultHandler()
494494
)

0 commit comments

Comments
 (0)