Fix emscripten_heap_resize (#13716)

sbc100 · web-flow · commit 3af9d8d9a799 · 2021-03-19T16:56:37.000-07:00
This is a partial revert of #13695 which broke test_zzz_zzz_emmalloc_4gb. The `oldSize` argument was being interpreted by signed by JS. Simpler just to read it directly rather than use the wrapper function.
diff --git a/src/library.js b/src/library.js
@@ -238,7 +238,7 @@ LibraryManager.library = {
   },
 #endif // ~TEST_MEMORY_GROWTH_FAILS
 
-  __emscripten_resize_heap__deps: [
+  emscripten_resize_heap__deps: [
 #if ASSERTIONS == 2
   , 'emscripten_get_now'
 #endif
@@ -249,7 +249,8 @@ LibraryManager.library = {
   , '$emscripten_realloc_buffer'
 #endif
   ],
-  __emscripten_resize_heap: function(oldSize, requestedSize) {
+  emscripten_resize_heap: function(requestedSize) {
+    var oldSize = HEAPU8.length;
 #if CAN_ADDRESS_2GB
     requestedSize = requestedSize >>> 0;
 #endif
diff --git a/system/lib/libc/emscripten_resize_heap.c b/system/lib/libc/emscripten_resize_heap.c
diff --git a/system/lib/standalone/standalone.c b/system/lib/standalone/standalone.c
@@ -124,8 +124,9 @@ size_t emscripten_get_heap_max() {
   return emscripten_get_heap_size();
 }
 
-int __emscripten_resize_heap(size_t old_size, size_t size) {
+int emscripten_resize_heap(size_t size) {
 #ifdef __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);
diff --git a/tests/mem_growth.cpp b/tests/mem_growth.cpp
@@ -3,25 +3,26 @@
 #include <emscripten/html5.h>
 #include <emscripten/heap.h>
 
-size_t prevheapsize = 0;
-EM_BOOL tick(double time, void *userData)
-{
-	size_t heap_size = emscripten_get_heap_size();
-	if (prevheapsize != heap_size)
-		printf("Heap size: %llu\n", (unsigned long long) heap_size);
-	prevheapsize = heap_size;
-	void *ptr = malloc(16*1024*1024);
-	if (!ptr)
-	{
-		printf("Cannot malloc anymore. Final heap size: %llu\n", (unsigned long long)emscripten_get_heap_size());
+EM_BOOL tick(double time, void *userData) {
+  static size_t prevheapsize = 0;
+  static int count = 0;
+  size_t heap_size = emscripten_get_heap_size();
+  if (prevheapsize != heap_size) {
+    printf("Heap size: %zu inc: %zu count: %d\n", heap_size, heap_size - prevheapsize, count);
+  }
+
+  prevheapsize = heap_size;
+  void *ptr = malloc(16*1024*1024);
+  if (!ptr) {
+    printf("Cannot malloc anymore. Final heap size: %llu\n", (unsigned long long)emscripten_get_heap_size());
 #ifdef REPORT_RESULT
-		REPORT_RESULT(emscripten_get_heap_size());
+    REPORT_RESULT(emscripten_get_heap_size());
 #endif
-	}
-	return !!ptr;
+  }
+  count++;
+  return !!ptr;
 }
 
-int main()
-{
-	emscripten_request_animation_frame_loop(tick, 0);
+int main() {
+  emscripten_request_animation_frame_loop(tick, 0);
 }
diff --git a/tests/other/metadce/hello_libcxx_O2.imports b/tests/other/metadce/hello_libcxx_O2.imports
@@ -1,6 +1,6 @@
-env.__emscripten_resize_heap
 env.abort
 env.emscripten_memcpy_big
+env.emscripten_resize_heap
 env.setTempRet0
 env.strftime_l
 wasi_snapshot_preview1.environ_get
diff --git a/tests/other/metadce/hello_libcxx_O2.sent b/tests/other/metadce/hello_libcxx_O2.sent
@@ -1,7 +1,7 @@
 __cxa_atexit
-__emscripten_resize_heap
 abort
 emscripten_memcpy_big
+emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions.imports
@@ -7,10 +7,10 @@ env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
-env.__emscripten_resize_heap
 env.__resumeException
 env.abort
 env.emscripten_memcpy_big
+env.emscripten_resize_heap
 env.getTempRet0
 env.invoke_diii
 env.invoke_fiii
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.sent b/tests/other/metadce/hello_libcxx_O2_fexceptions.sent
@@ -8,10 +8,10 @@ __cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
-__emscripten_resize_heap
 __resumeException
 abort
 emscripten_memcpy_big
+emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports
@@ -7,10 +7,10 @@ env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
-env.__emscripten_resize_heap
 env.__resumeException
 env.abort
 env.emscripten_memcpy_big
+env.emscripten_resize_heap
 env.getTempRet0
 env.invoke_diii
 env.invoke_fiii
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.sent b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.sent
@@ -8,10 +8,10 @@ __cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
-__emscripten_resize_heap
 __resumeException
 abort
 emscripten_memcpy_big
+emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.imports b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.imports
@@ -1,10 +1,10 @@
 GOT.mem.__heap_base
-env.__emscripten_resize_heap
 env.__indirect_function_table
 env.__memory_base
 env.__stack_pointer
 env.__table_base
 env.emscripten_memcpy_big
+env.emscripten_resize_heap
 env.memory
 env.setTempRet0
 wasi_snapshot_preview1.fd_write
diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.sent b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.sent
@@ -1,9 +1,9 @@
-__emscripten_resize_heap
 __indirect_function_table
 __memory_base
 __stack_pointer
 __table_base
 emscripten_memcpy_big
+emscripten_resize_heap
 fd_write
 memory
 setTempRet0
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.funcs b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.funcs
@@ -1,6 +1,6 @@
-$__emscripten_resize_heap
 $__main_void
 $__wasm_call_ctors
 $_start
 $dlmalloc
+$emscripten_resize_heap
 $sbrk
diff --git a/tests/other/test_split_main_module.out b/tests/other/test_split_main_module.out
@@ -1,3 +1,3 @@
-wrote profile of 240 bytes (allocated 240 bytes)
+wrote profile of 232 bytes (allocated 232 bytes)
 Hello from main!
 Hello from lib!
diff --git a/tests/other/test_split_module.out b/tests/other/test_split_module.out
@@ -1,2 +1,2 @@
-wrote profile of 232 bytes (allocated 232 bytes)
+wrote profile of 224 bytes (allocated 224 bytes)
 Hello! answer: 42
diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -738,7 +738,6 @@ def get_files(self):
           'wasi-helpers.c',
           'emscripten_pthread.c',
           'emscripten_get_heap_size.c',
-          'emscripten_resize_heap.c',
         ])
 
     libc_files += files_in_path(
