Skip to content

Wasm R2R: push this before retbuf in InterpToR2R thunk args #129356

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
AndyAyersMS merged 1 commit into from
Jun 14, 2026
+9 −8
Merged

Wasm R2R: push this before retbuf in InterpToR2R thunk args #129356

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
17 changes: 9 additions & 8 deletions ...mpiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/WasmInterpreterToR2RThunkNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr
expressions.Add(I32.Store(0));

// Build the arguments for the R2R call_indirect.
// Target R2R wasm params: ($sp, [retbuf], [this], explicit_params..., portableEntrypoint)
// Target R2R wasm params: ($sp, [this], [retbuf], explicit_params..., portableEntrypoint)
// (matches Compiler::lvaInitArgs / WasmR2RToInterpreterThunkNode local order.)
// We track targetParamIndex to look up the correct wasm type for each arg.
int targetParamIndex = 0;

Expand All @@ -154,13 +155,6 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr
expressions.Add(Global.Get(WasmObjectWriter.StackPointerGlobalIndex));
targetParamIndex++;

// If the R2R function takes a return buffer, pass pRet directly as the retbuf arg
if (hasRetBuffArg)
{
expressions.Add(Local.Get(LocalPRet));
targetParamIndex++;
}

// If the method has a 'this' pointer, load it from pArgs at offset 0
// (ArgIterator offset for this = OffsetOfArgumentRegisters = SizeOfTransitionBlock)
if (hasThis)
Expand All @@ -171,6 +165,13 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr
targetParamIndex++;
}

// If the R2R function takes a return buffer, pass pRet directly as the retbuf arg
if (hasRetBuffArg)
{
expressions.Add(Local.Get(LocalPRet));
targetParamIndex++;
}

// Explicit parameters — load each from pArgs at the ArgIterator-derived offset
for (int i = 0; i < methodSignature.Length; i++)
{
Expand Down
Loading