Skip to content

[wasm] Restore TARGET_WASM short-circuit in VirtualUnwindCallFrame #129551

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
lewing wants to merge 3 commits into from
+13 −0
Closed

[wasm] Restore TARGET_WASM short-circuit in VirtualUnwindCallFrame #129551

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3607037
[wasi] Restore TARGET_WASM short-circuit in VirtualUnwindCallFrame
lewing Jun 6, 2026
c83eabc
Update src/coreclr/vm/stackwalk.cpp
lewing Jun 18, 2026
3c1e28b
Narrow WASM short-circuit to non-virtual-IP contexts only
lewing Jun 18, 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
13 changes: 13 additions & 0 deletions src/coreclr/vm/stackwalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,19 @@ PCODE Thread::VirtualUnwindCallFrame(T_CONTEXT* pContext,
EECodeInfo * pCodeInfo /*= NULL*/
ARM64_ARG(TADDR * pSpForPacSign /*= NULL*/))
{
#ifdef TARGET_WASM
// WASM has a custom RtlVirtualUnwind (vm/wasm/helpers.cpp) that handles
// R2R-WASM frames keyed by virtual IPs. For interpreter-only WASM (e.g.,
// the WASI corerun) there is no R2R unwind info and no virtual IP, so
// walking past such a frame is not supported and the call into the body
// would corrupt the register display. Fail fast in that case; let R2R
// frames flow through the regular path below.
if (!ExecutionManager::IsVirtualIP(GetIP(pContext)))
{
_ASSERTE(!"VirtualUnwindCallFrame: non-virtual-IP context on WebAssembly");
return 0;
}
#endif // TARGET_WASM
CONTRACTL
{
NOTHROW;
Expand Down
Loading