[5.7-04182022][🍒] Fix jump-to-null issue for ObjC async calls. #58399
+30
−96
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
…ows call" This reverts commit afd26d3 to solve a critical miscompile caused by a hop_to_executor appearing between a get_continuation and await_continuation instruction in SIL. A reimplementation of SR-15703 will be forthcoming. Fixes rdar://91502776
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
Member
Author
|
@swift-ci please test |
kavon
added
concurrency
Member
Author
|
We decided this is not the right fix for this issue. It is also rare and has a known workaround. For now, closing this and starting work on a proper fix. Stage 1 is to use this instead: #58477 |
AnthonyLatsis
added
🍒 release cherry pick
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #58397
• Explanation: In rare situations, a miscompilation of async ObjC calls can lead to a runtime crash during the resumption of a task.
• Origination: Regression introduced in solving SR-15703 (#41571)
• Risk: Low. The primary risk is this PR reverts the fix for SR-15703, where an async-throws call to an ObjC method would not resume on the correct executor. The trade-off is that this bug is more of a show-stopper than being on an incorrect executor.
Resolves rdar://91502776