Skip to content

[wasm] Fix reflection invoke of R2R-compiled methods #129808

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
AndyAyersMS wants to merge 1 commit into from
+14 −1
Closed

[wasm] Fix reflection invoke of R2R-compiled methods #129808

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
15 changes: 14 additions & 1 deletion src/coreclr/vm/wasm/calldescrworkerwasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,18 @@ extern "C" void STDCALL CallDescrWorkerInternal(CallDescrData* pCallDescrData)
retBuff = &pCallDescrData->returnValue;
}

ExecuteInterpretedMethodWithArgs((TADDR)targetIp, args, argsSize, retBuff, (PCODE)&CallDescrWorkerInternal);
if (targetIp == NULL)
{
// The target has no interpreter code because it is R2R (native Wasm) compiled.
// Dispatch to the native entry point via the interpreter-to-R2R thunk, mirroring
// ExecuteInterpretedMethodWithArgs_PortableEntryPoint_Complex. Calling the
// interpreter with a NULL target would not execute the method and would leave the
// return buffer aliasing the incoming arguments.
ManagedMethodParam param = { pMethod, args, (int8_t*)retBuff, (PCODE)NULL, NULL };
InvokeManagedMethod(&param);
Comment on lines +43 to +49
}
else
{
ExecuteInterpretedMethodWithArgs((TADDR)targetIp, args, argsSize, retBuff, (PCODE)&CallDescrWorkerInternal);
}
}
Loading