Skip to content

[clr-interp] Fix handling of continuation return when it is not used by the method #128403

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

Merged
BrzVlad merged 2 commits into from
May 21, 2026
Merged

[clr-interp] Fix handling of continuation return when it is not used by the method #128403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e8af1
[clr-interp] Fix handling of continuation return when it is not used …
BrzVlad May 20, 2026
39b7b62
Apply suggestions from code review
BrzVlad May 21, 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
14 changes: 13 additions & 1 deletion src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6460,7 +6460,19 @@ void InterpCompiler::UpdateLocalIntervalMaps()
int32_t varIndex = suspendData->returnValueVarStackOffset;
if (varIndex != -1)
{
suspendData->returnValueVarStackOffset = m_pVars[varIndex].offset;
assert(!m_pVars[varIndex].global);
if (m_pVars[varIndex].liveStart == m_pVars[varIndex].liveEnd)
{
Comment thread
BrzVlad marked this conversation as resolved.
// The return result of the async call is not used by the method, so the allocated
// stack offset will be immediately reused by any vars that become live. Keep the
// continuation layout unchanged, but mark the return value stack offset as invalid
// so resume skips copying the stored result back to the interpreter stack.
suspendData->returnValueVarStackOffset = -1;
}
Comment thread
BrzVlad marked this conversation as resolved.
else
{
suspendData->returnValueVarStackOffset = m_pVars[varIndex].offset;
}
Comment thread
BrzVlad marked this conversation as resolved.
Comment thread
BrzVlad marked this conversation as resolved.
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4581,7 +4581,7 @@ do \

// Explicitly copy the return value from the continuation's result storage
// to the interpreter stack.
if (pAsyncSuspendData->returnValueContinuationDataSize > 0)
if (pAsyncSuspendData->returnValueVarStackOffset != -1)
{
memcpy(LOCAL_VAR_ADDR(pAsyncSuspendData->returnValueVarStackOffset, uint8_t),
continuation->GetResultStorage(),
Expand Down
Loading