Skip to content

Fix runtime async context restore after EnC remap #131722

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.

Sign up for GitHub

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

Closed
tommcdon wants to merge 2 commits into from
+23 −4
Closed

Fix runtime async context restore after EnC remap #131722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395b673
Fix runtime async context restore after EnC remap
tommcdon Aug 1, 2026
e50e2f6
Fix JIT formatting
tommcdon Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/coreclr/jit/async.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,19 @@ PhaseStatus Compiler::SaveAsyncContexts()
}
}

// Insert RestoreContexts call in fault (exceptional case)
// First argument: resumed = (continuation != null)
GenTree* resumed = gtNewLclvNode(lvaResumedIndicator, TYP_INT);
// Inlinees need an explicit indicator because they do not have a continuation
// argument. Root methods can use the continuation argument directly, which also
// remains correct when EnC remaps directly into a resumed method body.
GenTree* resumed;
if (compIsForInlining())
{
resumed = gtNewLclvNode(lvaResumedIndicator, TYP_INT);
}
else
{
GenTree* continuation = gtNewLclVarNode(lvaAsyncContinuationArg, TYP_REF);
resumed = gtNewOperNode(GT_NE, TYP_INT, continuation, gtNewNull());
}

GenTreeCall* restoreCall = gtNewUserCallNode(asyncInfo->restoreContextsMethHnd, TYP_VOID);
restoreCall->gtArgs.PushFront(this,
Expand Down Expand Up @@ -387,7 +397,16 @@ BasicBlock* Compiler::CreateReturnBB(unsigned* mergedReturnLcl)
// Insert "restore" call
CORINFO_ASYNC_INFO* asyncInfo = eeGetAsyncInfo();

GenTree* resumed = gtNewLclvNode(lvaResumedIndicator, TYP_INT);
GenTree* resumed;
if (compIsForInlining())
{
resumed = gtNewLclvNode(lvaResumedIndicator, TYP_INT);
}
else
{
GenTree* continuation = gtNewLclVarNode(lvaAsyncContinuationArg, TYP_REF);
resumed = gtNewOperNode(GT_NE, TYP_INT, continuation, gtNewNull());
}

GenTreeCall* restoreCall = gtNewUserCallNode(asyncInfo->restoreContextsMethHnd, TYP_VOID);
restoreCall->gtArgs.PushFront(this,
Expand Down
Loading