Skip to content

[wasm] Stop importing function table when compiling wasm modules in jiterp #88876

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
merged 1 commit into from
Jul 14, 2023
Merged

[wasm] Stop importing function table when compiling wasm modules in jiterp #88876

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/jiterpreter-interp-entry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function flush_wasm_entry_trampoline_jit_queue() {
for (let i = 0; i < trampImports.length; i++)
builder.markImportAsUsed(trampImports[i][0]);

builder._generateImportSection();
builder._generateImportSection(false);

// Function section
builder.beginSection(3);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/jiterpreter-jit-call.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ export function mono_interp_flush_jitcall_queue(): void {
for (let i = 0; i < trampImports.length; i++)
builder.markImportAsUsed(trampImports[i][0]);

builder._generateImportSection();
builder._generateImportSection(false);

// Function section
builder.beginSection(3);
Expand Down
10 changes: 8 additions & 2 deletions src/mono/wasm/runtime/jiterpreter-support.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export class WasmBuilder {
const result: any = {
c: <any>this.getConstants(),
m: { h: (<any>Module).asm.memory },
f: { f: getWasmFunctionTable() },
// f: { f: getWasmFunctionTable() },
};

const importsToEmit = this.getImportsToEmit();
Expand Down Expand Up @@ -520,6 +520,9 @@ export class WasmBuilder {
const importsToEmit = this.getImportsToEmit();
this.lockImports = true;

if (includeFunctionTable !== false)
throw new Error("function table imports are disabled");

// Import section
this.beginSection(2);
this.appendULeb(
Expand Down Expand Up @@ -687,14 +690,17 @@ export class WasmBuilder {
this.endSection();
}

call_indirect(functionTypeName: string, tableIndex: number) {
call_indirect(/* functionTypeName: string, tableIndex: number */) {
throw new Error("call_indirect unavailable");
/*
const type = this.functionTypes[functionTypeName];
if (!type)
throw new Error("No function type named " + functionTypeName);
const typeIndex = type[0];
this.appendU8(WasmOpcode.call_indirect);
this.appendULeb(typeIndex);
this.appendULeb(tableIndex);
*/
}

callImport(name: string) {
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/jiterpreter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ function generate_wasm(
}
);

builder.emitImportsAndFunctions();
builder.emitImportsAndFunctions(false);

if (!keep) {
if (ti && (ti.abortReason === "end-of-body"))
Expand Down