Skip to content

Re-Enable JIT calls for Wasm Target in Crossgen #122334

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 1 commit into from
Dec 9, 2025
Merged

Re-Enable JIT calls for Wasm Target in Crossgen #122334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 2 additions & 40 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,36 +317,6 @@ IntPtr LocalObjectToHandle(object input)
return null;
}

private CorJitResult CompileWasmStub(out IntPtr exception, ref CORINFO_METHOD_INFO methodInfo, out uint codeSize)
{
byte[] stub =
[
0x00, // local variable count
0x41, // i32.const
0x0, // uleb128 0
0x0F, // return
0x0B, // end
];
AllocMemArgs args = new AllocMemArgs
{
hotCodeSize = (uint)stub.Length,
coldCodeSize = (uint)0,
roDataSize = (uint)0,
xcptnsCount = _ehClauses != null ? (uint)_ehClauses.Length : 0,
flag = CorJitAllocMemFlag.CORJIT_ALLOCMEM_DEFAULT_CODE_ALIGN,
};
allocMem(ref args);

_code = stub;

codeSize = (uint)stub.Length;
exception = IntPtr.Zero;

_codeRelocs = new();

return CorJitResult.CORJIT_OK;
}

private CompilationResult CompileMethodInternal(IMethodNode methodCodeNodeNeedingCode, MethodIL methodIL)
{
// methodIL must not be null
Expand All @@ -369,17 +339,9 @@ private CompilationResult CompileMethodInternal(IMethodNode methodCodeNodeNeedin
IntPtr exception;
IntPtr nativeEntry;
uint codeSize;

TargetArchitecture architecture = _compilation.TypeSystemContext.Target.Architecture;
var result = architecture switch
{
// We currently do not have WASM codegen support, but for testing, we will return a stub
TargetArchitecture.Wasm32 => CompileWasmStub(out exception, ref methodInfo, out codeSize),
_ => JitCompileMethod(out exception,
var result = JitCompileMethod(out exception,
_jit, (IntPtr)(&_this), _unmanagedCallbacks,
ref methodInfo, (uint)CorJitFlag.CORJIT_FLAG_CALL_GETJITFLAGS, out nativeEntry, out codeSize)
};

ref methodInfo, (uint)CorJitFlag.CORJIT_FLAG_CALL_GETJITFLAGS, out nativeEntry, out codeSize);
if (exception != IntPtr.Zero)
{
if (_lastException != null)
Expand Down
Loading