Skip to content

[Wasm] Add missing return buffer argument in wasm import thunks #128104

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

Draft
kg wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −0
Draft

[Wasm] Add missing return buffer argument in wasm import thunks #128104

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24e0e75
Add missing return buffer argument in wasm import thunks
kg May 12, 2026
8f7f8bb
Handle this ptr not being present
kg May 12, 2026
f8dedf8
Checkpoint
kg May 12, 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
14 changes: 14 additions & 0 deletions ...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/WasmImportThunk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr

int[] offsets = new int[methodSignature.Length];
bool[] isIndirectStructArg = new bool[methodSignature.Length];
bool hasRetBuffArg = _wasmSignature.SignatureString[0] == 'S';

Comment on lines 129 to 132
int argIndex = 0;
int argOffset;
Expand Down Expand Up @@ -195,6 +196,12 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr
wasmLocalIndex++;
}

if (hasRetBuffArg)
{
// FIXME: What do I do here?
wasmLocalIndex++;
}

for (int i = 0; i < methodSignature.Length; i++)
{
TypeDesc paramType = methodSignature[i];
Expand Down Expand Up @@ -302,6 +309,13 @@ protected override void EmitCode(NodeFactory factory, ref Wasm.WasmEmitter instr
wasmLocalIndex++;
}

// Pass return buffer argument if needed
if (hasRetBuffArg)
{
expressions.Add(Local.Get(wasmLocalIndex));
wasmLocalIndex++;
}

for (int i = 0; i < methodSignature.Length; i++)
{
TypeDesc paramType = methodSignature[i];
Expand Down
Loading