Fix runtime async context restore after EnC remap - #131722
Closed
tommcdon wants to merge 2 commits into
Closed
Conversation
Use the continuation argument for root-method context restoration so Edit-and-Continue remaps do not depend on a synthesized resumed indicator that is not preserved in the remapped frame. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
github-actions
Bot
added
the
area-CodeGen-coreclr
|
Azure Pipelines: Successfully started running 5 pipeline(s). 11 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates how the JIT determines whether an async method is “resumed” when emitting the method-level RestoreContexts calls. For non-inlined (root) methods it now computes resumed from the async continuation argument (continuation != null) instead of reading the synthesized lvaResumedIndicator local, while preserving the existing local-based approach for inlinees (which don’t have a continuation argument).
Changes:
- In
SaveAsyncContexts(), compute theresumedargument for the fault-pathRestoreContextscall fromlvaAsyncContinuationArgfor root methods, and keep usinglvaResumedIndicatorfor inlinees. - In
CreateReturnBB(), apply the same root-vs-inlineeresumedcomputation for the normal return-pathRestoreContextscall.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
|
Not sure this will be quite sufficient. I opened #131731 to handle it in the same way as other transition-preserved state. Can you test with that? |
Member
Author
|
Superceded by #131731 |
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
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.
Use the continuation argument for root-method context restoration so Edit-and-Continue remaps do not depend on a synthesized resumed indicator that is not preserved in the remapped frame.