Skip to content

[Wasm RyuJit] Fix: Move implReadyToRunUnsupported() call for funclets before wasm codegen #127185

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
adamperlin merged 2 commits into from
Apr 21, 2026
+16 −12
Merged

[Wasm RyuJit] Fix: Move implReadyToRunUnsupported() call for funclets before wasm codegen #127185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972d8b3
Move implReadyToRunUnsupported() call for funclets before wasm codegen.
adamperlin Apr 20, 2026
36a9db6
jit-format
adamperlin Apr 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
28 changes: 16 additions & 12 deletions src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,6 +1967,22 @@ void CodeGen::genUpdateCurrentFunclet(BasicBlock* block)
//
void CodeGen::genGenerateCode(void** codePtr, uint32_t* nativeSizeOfCode)
{
#if defined(TARGET_WASM)
// Fail at this point for any method with funclets, since the Wasm we produce
// for such methods requires post-processing by the host before it can be validated.
// This must be done BEFORE codegen, because of the edge case of a method
// which only needs funclets if compiled with optimizations (e.g., if we inline a method that has EH into a method
// that does not). In these cases, if we fail compilation of the optimized method AFTER codegen and then go to
// recompile the same method with minopts and succeed, we may be leaving stale relocs on the host side that only
// applied to the optimized version, which will cause unexpected behavior.
// TODO-WASM: Remove this once the host can do the processing.
//
if ((JitConfig.JitWasmFunclets() == 0) && (m_compiler->compFuncCount() > 1))
{
JITDUMP("Failing R2R codegen because method has funclets.\n");
implReadyToRunUnsupported();
}
#endif

#ifdef DEBUG
if (verbose)
Expand Down Expand Up @@ -2014,18 +2030,6 @@ void CodeGen::genGenerateCode(void** codePtr, uint32_t* nativeSizeOfCode)
}
#endif // defined(TARGET_WASM)
#endif // DEBUG

#if defined(TARGET_WASM)
// Also fail at this point for any method with funclets, since the Wasm we produce
// for such methods requires post-processing by the host before it can be validated.
// TODO-WASM: Remove this once the host can do the processing.
//
if ((JitConfig.JitWasmFunclets() == 0) && (m_compiler->compFuncCount() > 1))
{
JITDUMP("Failing R2R codegen because method has funclets.\n");
implReadyToRunUnsupported();
}
#endif
}

//----------------------------------------------------------------------
Expand Down
Loading