Use the distributed thunk for non-distributed protocol requirements #59514
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. (cherry picked from commit 25a7988)
…hunk We cannot hop to a distributed actor directly, so call through the distributed thunk instead. (cherry picked from commit 840b7ea)
When a distributed-actor-isolated witness is provided for a non-distributed-actor-isolated requirement, always hop to the distributed thunk. While here, mark distributed thunks as being `final`, to ensure that we always statically call them vs. trying to retrieve them from the vtable (since they aren't in the vtable).
|
@swift-ci please test |
|
Huh, only the last commit is new. The rest got merged already as part of #59456 |
DougGregor
changed the title
|
@swift-ci please build toolchain |
nkcsgexi
approved these changes
Jun 17, 2022
|
Unrelated macOS failure: |
|
@swift-ci please test macOS |
|
The failing test was reverted @swift-ci please test macOS |
|
Cherry pick of #59513 |
AnthonyLatsis
added
🍒 release cherry pick
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 distributed-actor-isolated witness is provided for a
non-distributed-actor-isolated requirement, always hop to the
distributed thunk.
While here, mark distributed thunks as being
final, to ensure thatwe always statically call them vs. trying to retrieve them from the
vtable (since they aren't in the vtable).
Fixes the rest of the distributed part of rdar://92881539.