Skip to content

Fix wasm table access when accessing functions in splitted module #25432

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 7 commits into from
Oct 8, 2025
+5 −3
Merged

Fix wasm table access when accessing functions in splitted module #25432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a1d39e
Fix wasm table access
Mintyboi Sep 30, 2025
5269096
Combine logic to have a single return statement
Mintyboi Sep 30, 2025
a01c931
Add missing semi colon
Mintyboi Sep 30, 2025
680fdf6
Merge branch 'main' into fix-split-module-load
Mintyboi Oct 7, 2025
b2166da
update test_split_module to run wasm64
Mintyboi Oct 8, 2025
c9d3615
Merge branch 'main' into fix-split-module-load
Mintyboi Oct 8, 2025
813007e
Add in memory64 flag during splitting in tests
Mintyboi Oct 8, 2025
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
5 changes: 2 additions & 3 deletions src/preamble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,9 @@ var splitModuleProxyHandler = {
// When the table is dynamically laid out, the placeholder functions names
// are offsets from the table base. In the main module, the table base is
// always 1.
return wasmTable.get(1 + parseInt(prop))(...args);
#else
return wasmTable.get(prop)(...args);
prop = 1 + parseInt(prop);
#endif
return wasmTable.get({{{ toIndexType('prop') }}})(...args);
#endif
}
}
Expand Down
3 changes: 3 additions & 0 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12816,6 +12816,7 @@ def test_syslog(self):
def test_syscall_stubs(self):
self.do_other_test('test_syscall_stubs.c')

@also_with_wasm64
@parameterized({
'': (False, False, False),
'custom': (True, False, False),
Expand Down Expand Up @@ -12848,6 +12849,8 @@ def test_split_module(self, customLoader, jspi, opt):
'--export-prefix=%', 'test_split_module.wasm.orig', '-o1', 'primary.wasm', '-o2', 'secondary.wasm', '--profile=profile.data']
if jspi:
wasm_split_run += ['--jspi', '--enable-reference-types']
if self.get_setting('MEMORY64'):
wasm_split_run += ['--enable-memory64']
self.run_process(wasm_split_run)

os.remove('test_split_module.wasm')
Expand Down