Skip to content

Commit 9d5822a

Browse files
backesCommit Bot
authored andcommitted
[wasm] WasmGrowMemory runtime function must return Smi
The WasmGrowMemory builtin (defined in builtins-wasm-gen.cc) expects the runtime function to return a Smi. Thus ensure that we are really always returning a Smi. [email protected] Change-Id: I153d75a2ab8773adbcce01e9aa125a234c93d077 Reviewed-on: https://chromium-review.googlesource.com/1131737 Reviewed-by: Michael Starzinger <[email protected]> Commit-Queue: Clemens Hammacher <[email protected]> Cr-Commit-Position: refs/heads/master@{#54411}
1 parent 7bff339 commit 9d5822a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/runtime/runtime-wasm.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,11 @@ RUNTIME_FUNCTION(Runtime_WasmGrowMemory) {
8080
DCHECK_NULL(isolate->context());
8181
isolate->set_context(instance->native_context());
8282

83-
return *isolate->factory()->NewNumberFromInt(WasmMemoryObject::Grow(
84-
isolate, handle(instance->memory_object(), isolate), delta_pages));
83+
int ret = WasmMemoryObject::Grow(
84+
isolate, handle(instance->memory_object(), isolate), delta_pages);
85+
// The WasmGrowMemory builtin which calls this runtime function expects us to
86+
// always return a Smi.
87+
return Smi::FromInt(ret);
8588
}
8689

8790
RUNTIME_FUNCTION(Runtime_ThrowWasmError) {

0 commit comments

Comments
 (0)