[Distributed] Fix when we invoke thunk, base it on typesystem implicit effects #39542
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -Xfrontend -enable-experimental-distributed -parse-as-library) | %FileCheck %s --dump-input=always | ||
|
|
||
| // REQUIRES: executable_test | ||
| // REQUIRES: concurrency | ||
|
|
@@ -11,8 +11,6 @@ | |
| // rdar://77798215 | ||
| // UNSUPPORTED: OS=windows-msvc | ||
|
|
||
|
There was a problem hiding this comment. we enable all of them in #38914 |
||
| import _Distributed | ||
| import _Concurrency | ||
|
|
||
|
|
@@ -43,6 +41,31 @@ distributed actor SomeSpecificDistributedActor { | |
| "local(\(#function))" | ||
| } | ||
|
|
||
| distributed func callTaskSelf_inner() async throws -> String { | ||
| "local(\(#function))" | ||
| } | ||
| distributed func callTaskSelf() async -> String { | ||
| do { | ||
| return try await Task { | ||
| let called = try await callTaskSelf_inner() // shouldn't use the distributed thunk! | ||
| return "local(\(#function)) -> \(called)" | ||
| }.value | ||
| } catch { | ||
| return "WRONG local(\(#function)) thrown(\(error))" | ||
| } | ||
| } | ||
|
|
||
| distributed func callDetachedSelf() async -> String { | ||
| do { | ||
| return try await Task.detached { | ||
| let called = try await self.callTaskSelf_inner() // shouldn't use the distributed thunk! | ||
| return "local(\(#function)) -> \(called)" | ||
| }.value | ||
| } catch { | ||
| return "WRONG local(\(#function)) thrown(\(error))" | ||
| } | ||
| } | ||
|
|
||
| // === errors | ||
|
|
||
| distributed func helloThrowsImplBoom() throws -> String { | ||
|
|
@@ -76,6 +99,21 @@ extension SomeSpecificDistributedActor { | |
| "remote(\(#function))" | ||
| } | ||
|
|
||
| @_dynamicReplacement(for:_remote_callTaskSelf()) | ||
| nonisolated func _remote_impl_callTaskSelf() async throws -> String { | ||
| "remote(\(#function))" | ||
| } | ||
|
|
||
| @_dynamicReplacement(for:_remote_callDetachedSelf()) | ||
| nonisolated func _remote_impl_callDetachedSelf() async throws -> String { | ||
| "remote(\(#function))" | ||
| } | ||
|
|
||
| @_dynamicReplacement(for:_remote_callTaskSelf_inner()) | ||
| nonisolated func _remote_impl_callTaskSelf_inner() async throws -> String { | ||
| "remote(\(#function))" | ||
| } | ||
|
|
||
| // === errors | ||
|
|
||
| @_dynamicReplacement(for:_remote_helloThrowsImplBoom()) | ||
|
|
@@ -103,9 +141,6 @@ func __isLocalActor(_ actor: AnyObject) -> Bool { | |
| @available(SwiftStdlib 5.5, *) | ||
| struct ActorAddress: ActorIdentity { | ||
| let address: String | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.5, *) | ||
|
|
@@ -114,15 +149,15 @@ struct FakeTransport: ActorTransport { | |
| fatalError("not implemented:\(#function)") | ||
| } | ||
|
|
||
| func resolve<Act>(_ identity: AnyActorIdentity, as actorType: Act.Type) | ||
| throws -> Act? | ||
| where Act: DistributedActor { | ||
| return nil | ||
| } | ||
|
|
||
| func assignIdentity<Act>(_ actorType: Act.Type) -> AnyActorIdentity | ||
| where Act: DistributedActor { | ||
| .init(ActorAddress(address: "")) | ||
| } | ||
|
|
||
| func actorReady<Act>(_ actor: Act) where Act: DistributedActor { | ||
|
|
@@ -151,25 +186,31 @@ func test_remote_invoke(address: ActorAddress, transport: ActorTransport) async | |
| let h4 = try! await actor.hello() | ||
| print("\(personality) - hello: \(h4)") | ||
|
|
||
| let h5 = try! await actor.callTaskSelf() | ||
| print("\(personality) - callTaskSelf: \(h5)") | ||
|
|
||
| let h6 = try! await actor.callDetachedSelf() | ||
| print("\(personality) - callDetachedSelf: \(h6)") | ||
|
|
||
| // error throws | ||
| if __isRemoteActor(actor) { | ||
| do { | ||
| _ = try await actor.helloThrowsTransportBoom() | ||
| print("WRONG: helloThrowsTransportBoom: should have thrown") | ||
| } catch { | ||
| print("\(personality) - helloThrowsTransportBoom: \(error)") | ||
| } | ||
| } else { | ||
| do { | ||
| _ = try await actor.helloThrowsImplBoom() | ||
| print("WRONG: helloThrowsImplBoom: Should have thrown") | ||
ktoso marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } catch { | ||
| print("\(personality) - helloThrowsImplBoom: \(error)") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let remote = try! SomeSpecificDistributedActor.resolve(.init(address), using: transport) | ||
| assert(__isRemoteActor(remote) == true, "should be remote") | ||
|
|
||
| let local = SomeSpecificDistributedActor(transport: transport) | ||
|
|
@@ -182,6 +223,8 @@ func test_remote_invoke(address: ActorAddress, transport: ActorTransport) async | |
| // CHECK: local - helloAsync: local(helloAsync()) | ||
| // CHECK: local - helloThrows: local(helloThrows()) | ||
| // CHECK: local - hello: local(hello()) | ||
| // CHECK: local - callTaskSelf: local(callTaskSelf()) -> local(callTaskSelf_inner()) | ||
| // CHECK: local - callDetachedSelf: local(callDetachedSelf()) -> local(callTaskSelf_inner()) | ||
| // CHECK: local - helloThrowsImplBoom: Boom(whoFailed: "impl") | ||
|
|
||
| print("remote isRemote: \(__isRemoteActor(remote))") | ||
|
|
@@ -191,6 +234,8 @@ func test_remote_invoke(address: ActorAddress, transport: ActorTransport) async | |
| // CHECK: remote - helloAsync: remote(_remote_impl_helloAsync()) | ||
| // CHECK: remote - helloThrows: remote(_remote_impl_helloThrows()) | ||
| // CHECK: remote - hello: remote(_remote_impl_hello()) | ||
| // CHECK: remote - callTaskSelf: remote(_remote_impl_callTaskSelf()) | ||
| // CHECK: remote - callDetachedSelf: remote(_remote_impl_callDetachedSelf()) | ||
| // CHECK: remote - helloThrowsTransportBoom: Boom(whoFailed: "transport") | ||
|
|
||
| print(local) | ||
|
|
@@ -200,7 +245,7 @@ func test_remote_invoke(address: ActorAddress, transport: ActorTransport) async | |
| @available(SwiftStdlib 5.5, *) | ||
| @main struct Main { | ||
| static func main() async { | ||
| let address = ActorAddress(address: "") | ||
| let transport = FakeTransport() | ||
|
|
||
| await test_remote_invoke(address: address, transport: transport) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be set to
falsein theApplyExprconstructor, or you'll end up with spuriously-distributed calls due to uninitialized memory.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh man, thanks I totally forgot about that 😱