Skip to content

[SR-15703] Fix missing hop in error path of foreign async throws call #41571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2022

Conversation

kavon
Copy link
Member

@kavon kavon commented Feb 26, 2022

The error path of the emitted try_apply had no hop injected, when it is especially needed if there is a catch in the isolated function.

This resolves SR-15703 / rdar://89479707

Since the clean-up is not unwind only, we can rely on the
clean-ups to be emitted on both result and throw paths.

This does slightly change when the hop_to_executor is emitted,
in those paths, but that shouldn't matter.

refactors solution for rdar://78982371
@kavon
Copy link
Member Author

kavon commented Feb 26, 2022

@swift-ci please test and merge

Copy link
Contributor

@rjmccall rjmccall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@swift-ci swift-ci merged commit e16b126 into swiftlang:main Feb 26, 2022
kavon added a commit to kavon/swift that referenced this pull request Apr 25, 2022
This reverts commit 01d470c.

Just to be safe, I'm reverting this part of swiftlang#41571
as well, until it can be reimplemented in light of issues where a hop
can appear between a get_continuation and an await_continuation

resolves rdar://91502776
kavon added a commit to kavon/swift that referenced this pull request Apr 25, 2022
This reverts commit 01d470c.

Just to be safe, I'm reverting this part of swiftlang#41571
as well, until it can be reimplemented in light of issues where a hop
can appear between a get_continuation and an await_continuation

resolves rdar://91502776
kavon added a commit to kavon/swift that referenced this pull request Apr 25, 2022
This reverts commit 01d470c.

Just to be safe, I'm reverting this part of swiftlang#41571
as well, until it can be reimplemented in light of issues where a hop
can appear between a get_continuation and an await_continuation

resolves rdar://91502776
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants