From 1fa5ab1eb15da570693ce33551e9f627f5320af1 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 1 Oct 2024 14:52:32 -0700
Subject: [PATCH] Add `toIndexType` when calling Memory.grow

This was missing from #22497 and is currently causing
test_embind_o2_mem_growth_wasm64 to fail with the latest nightly version
of d8.
---
 src/library.js                                       | 4 ++--
 test/other/codesize/test_codesize_mem_O3_grow.gzsize | 2 +-
 test/other/codesize/test_codesize_mem_O3_grow.jssize | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library.js b/src/library.js
index 20a5ed468ea4b..a33161c9ead06 100644
--- a/src/library.js
+++ b/src/library.js
@@ -186,7 +186,7 @@ addToLibrary({
   // it. Returns 1 on success, 0 on error.
   $growMemory: (size) => {
     var b = wasmMemory.buffer;
-    var pages = (size - b.byteLength + {{{ WASM_PAGE_SIZE - 1 }}}) / {{{ WASM_PAGE_SIZE }}};
+    var pages = ((size - b.byteLength + {{{ WASM_PAGE_SIZE - 1 }}}) / {{{ WASM_PAGE_SIZE }}}) | 0;
 #if RUNTIME_DEBUG
     dbg(`growMemory: ${size} (+${size - b.byteLength} bytes / ${pages} pages)`);
 #endif
@@ -195,7 +195,7 @@ addToLibrary({
 #endif
     try {
       // round size grow request up to wasm page size (fixed 64KB per spec)
-      wasmMemory.grow(pages); // .grow() takes a delta compared to the previous size
+      wasmMemory.grow({{{ toIndexType('pages') }}}); // .grow() takes a delta compared to the previous size
       updateMemoryViews();
 #if MEMORYPROFILER
       if (typeof emscriptenMemoryProfiler != 'undefined') {
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.gzsize b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
index aed4b56065d98..12fda76f5d0c5 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
@@ -1 +1 @@
-2558
+2559
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.jssize b/test/other/codesize/test_codesize_mem_O3_grow.jssize
index 5de804a0900c1..e596651c09859 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.jssize
@@ -1 +1 @@
-5294
+5296