Skip to content

Make emscripten_resize_heap compatible with PURE_WASI #22217

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
sbc100 merged 1 commit into from
Jul 15, 2024
Merged

Make emscripten_resize_heap compatible with PURE_WASI #22217

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
4 changes: 3 additions & 1 deletion system/lib/standalone/standalone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,16 @@ size_t emscripten_get_heap_max() {
}

int emscripten_resize_heap(size_t size) {
#if defined(EMSCRIPTEN_MEMORY_GROWTH) && !defined(EMSCRIPTEN_PURE_WASI)
#if defined(EMSCRIPTEN_MEMORY_GROWTH)
size_t old_size = __builtin_wasm_memory_size(0) * WASM_PAGE_SIZE;
assert(old_size < size);
ssize_t diff = (size - old_size + WASM_PAGE_SIZE - 1) / WASM_PAGE_SIZE;
size_t result = __builtin_wasm_memory_grow(0, diff);
if (result != (size_t)-1) {
#if !defined(EMSCRIPTEN_PURE_WASI)
// Success, update JS (see https://github.com/WebAssembly/WASI/issues/82)
emscripten_notify_memory_growth(0);
#endif
return 1;
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ def test_memorygrowth_3(self):
self.set_setting('SAFE_HEAP')
self.do_core_test('test_memorygrowth_3.c')

@also_with_standalone_wasm(impure=True)
@also_with_standalone_wasm()
@no_4gb('depends on INITIAL_MEMORY')
@no_2gb('depends on INITIAL_MEMORY')
def test_memorygrowth_MAXIMUM_MEMORY(self):
Expand Down