[5.7-🍒] Proper fix for ObjC async jump to null #58629
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 two objc async functions are composed with each other, i.e., f(g()), then the clean-ups for g() would get emitted at an unexpected time, namely, during the suspension for the call to f(). This means that using a clean-up to emit the executor-hop breadcrumb was incorrect. The hop could appear between a get_async continuation and its matching await_continuation, which is an unsupported nested suspension. This commit fixes that by removing the use of the breadcrumb clean-up in favor of providing that breadcrumb directly to the result plan, so that it may be emitted later on when the result plan sees fit. Fixes rdar://91502776
kavon
added
concurrency
|
@swift-ci please test |
jckarter
reviewed
May 3, 2022
DougGregor
approved these changes
May 4, 2022
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.
Cherry-pick of #58515
when two objc async functions are composed with each other,
i.e., f(g()), then the clean-ups for g() would get emitted
at an unexpected time, namely, during the suspension for
the call to f(). This means that using a clean-up to emit
the executor-hop breadcrumb was incorrect. The hop could
appear between a get_async continuation and its matching
await_continuation, which is an unsupported nested suspension.
This commit fixes that by removing the use of the breadcrumb
clean-up in favor of providing that breadcrumb directly to
the result plan, so that it may be emitted later on when the
result plan sees fit.
Fixes rdar://91502776