Teach witness thunks to hop to the actor when needed. #59450
Merged
Conversation
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
When a synchronous, actor-isolated declaration witnesses an asynchronous, not-similarly-isolated requirement, emit an actor hop within the witness thunk to ensure that we properly enter the context of the actor. Fixes swiftlang#58517 / rdar://92881539.
…hunk We cannot hop to a distributed actor directly, so call through the distributed thunk instead.
|
@swift-ci please test |
ktoso
reviewed
Jun 15, 2022
ktoso
approved these changes
Jun 15, 2022
|
Okey I think this is also correct... just wanted to double check: protocol DistServerProto: DistributedActor {
distributed func distDoSomething()
}
extension DA: DistServerProto {
// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s17distributed_thunk2DACAA15DistServerProtoA2aDP15distDoSomethingyyFTW : $@convention(witness_method: DistServerProto) (@guaranteed DA) -> () {
// CHECK-NOT: hop_to_executor
// CHECK-NOT: return
// CHECK: function_ref @$s17distributed_thunk2DAC15distDoSomethingyyF
// CHECK: return
distributed func distDoSomething() { }
} |
Yeah, that looks right to me. |
|
Windows failure is unrelated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When a synchronous, actor-isolated declaration witnesses an
asynchronous, not-similarly-isolated requirement, emit an actor hop
within the witness thunk to ensure that we properly enter the context
of the actor.
When the witness is distributed, we go through the distributed thunk
rather than hopping to the actor.
Fixes #58517 / rdar://92881539.