[Wasm64] Fix argv handling for >4GB memories

Author: sbc100

.circleci/config.yml

@@ -618,6 +618,7 @@ jobs:
             wasm64
             wasm64_4gb.test_hello_world
             wasm64_4gb.test_em_asm
+            wasm64_4gb.test_async_main
             core_2gb.test_em_asm
             wasm64l.test_bigswitch
             other.test_memory64_proxies

emcc.py

@@ -2421,7 +2421,7 @@ def phase_linker_setup(options, state, newargs):
     settings.EXPORT_IF_DEFINED.append('__wasm_apply_data_relocs')
 
   if settings.SIDE_MODULE and 'GLOBAL_BASE' in user_settings:
-    exit_with_error('GLOBAL_BASE is not compatible with SIDE_MODULE')
+    diagnostics.warning('unused-command-line-argument', 'GLOBAL_BASE is not compatible with SIDE_MODULE')
 
   if settings.PROXY_TO_WORKER or options.use_preload_plugins:
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$Browser']

src/postamble.js

@@ -74,11 +74,12 @@ function callMain() {
 
   var argc = args.length;
   var argv = stackAlloc((argc + 1) * {{{ POINTER_SIZE }}});
-  var argv_ptr = argv >> {{{ POINTER_SHIFT }}};
+  var argv_ptr = argv;
   args.forEach((arg) => {
-    {{{ POINTER_HEAP }}}[argv_ptr++] = {{{ to64('stringToUTF8OnStack(arg)') }}};
+    {{{ makeSetValue('argv_ptr', 0, 'stringToUTF8OnStack(arg)', '*') }}};
+    argv_ptr += {{{ POINTER_SIZE }}};
   });
-  {{{ POINTER_HEAP }}}[argv_ptr] = {{{ to64('0') }}};
+  {{{ makeSetValue('argv_ptr', 0, 0, '*') }}};
 #else
   var argc = 0;
   var argv = 0;

test/common.py

@@ -575,6 +575,10 @@ def check_dylink(self):
       self.skipTest('no dynamic linking support in wasm2js yet')
     if '-fsanitize=undefined' in self.emcc_args:
       self.skipTest('no dynamic linking support in UBSan yet')
+    # Dynamic linking requires IMPORTED_MEMORY which depends on the JS API
+    # for creating 64-bit memories.
+    if self.get_setting('GLOBAL_BASE') == '4gb':
+      self.skipTest('no support for IMPORTED_MEMORY over 4gb yet')
 
   def require_v8(self):
     if not config.V8_ENGINE or config.V8_ENGINE not in config.JS_ENGINES:
@@ -705,6 +709,10 @@ def setup_node_pthreads(self):
     self.emcc_args += ['-Wno-pthreads-mem-growth', '-pthread']
     if self.get_setting('MINIMAL_RUNTIME'):
       self.skipTest('node pthreads not yet supported with MINIMAL_RUNTIME')
+    # Pthread support requires IMPORTED_MEMORY which depends on the JS API
+    # for creating 64-bit memories.
+    if self.get_setting('GLOBAL_BASE') == '4gb':
+      self.skipTest('no support for IMPORTED_MEMORY over 4gb yet')
     self.js_engines = [config.NODE_JS]
     self.node_args += shared.node_pthread_flags()
 

test/other/metadce/test_metadce_hello_dylink.jssize

@@ -1 +1 @@
-14822
+14820

test/other/metadce/test_metadce_mem_O3.jssize

@@ -1 +1 @@
-5774
+5780

test/other/metadce/test_metadce_mem_O3_grow.jssize

@@ -1 +1 @@
-6094
+6100

test/runner.py

@@ -69,6 +69,7 @@
   'ubsan',
   'wasm64',
   'wasm64_v8',
+  'wasm64_4gb',
 ]
 
 # The default core test mode, used when none is specified

test/test_core.py

@@ -2378,6 +2378,8 @@ def test_memorygrowth_3_force_fail_reallocBuffer(self):
   @no_asan('requires more memory when growing')
   @no_lsan('requires more memory when growing')
   def test_aborting_new(self, args):
+    if self.get_setting('INITIAL_MEMORY'):
+      self.skipTest('test depends on default INITIAL_MEMORY')
     # test that C++ new properly errors if we fail to malloc when growth is
     # enabled, with or without growth
     self.emcc_args += args
@@ -6517,6 +6519,9 @@ def test_whets(self):
   @no_asan('depends on the specifics of memory size, which for asan we are forced to increase')
   @no_lsan('depends on the specifics of memory size, which for lsan we are forced to increase')
   def test_dlmalloc_inline(self):
+    if self.get_setting('INITIAL_MEMORY'):
+      self.skipTest('test depends on default INITIAL_MEMORY')
+
     # needed with typed arrays
     self.set_setting('INITIAL_MEMORY', '128mb')
 
@@ -6530,6 +6535,9 @@ def test_dlmalloc_inline(self):
   @no_lsan('depends on the specifics of memory size, which for lsan we are forced to increase')
   @no_wasmfs('wasmfs does some malloc/free during startup, fragmenting the heap, leading to differences later')
   def test_dlmalloc(self):
+    if self.get_setting('INITIAL_MEMORY'):
+      self.skipTest('test depends on default INITIAL_MEMORY')
+
     # needed with typed arrays
     self.set_setting('INITIAL_MEMORY', '128mb')
 
@@ -6562,6 +6570,9 @@ def test_dlmalloc(self):
   @no_asan('the memory size limit here is too small for asan')
   @no_lsan('the memory size limit here is too small for lsan')
   def test_dlmalloc_large(self):
+    if self.get_setting('INITIAL_MEMORY'):
+      self.skipTest('test depends on default INITIAL_MEMORY')
+
     self.emcc_args += ['-sABORTING_MALLOC=0', '-sALLOW_MEMORY_GROWTH=1', '-sMAXIMUM_MEMORY=128MB']
     self.do_runf(test_file('dlmalloc_test_large.c'), '0 0 0 1')
 
@@ -8396,6 +8407,7 @@ def test_asyncify_during_exit(self):
   @no_lsan('undefined symbol __global_base')
   @no_wasm2js('dynamic linking support in wasm2js')
   @with_asyncify_and_jspi
+  @needs_dylink
   def test_asyncify_main_module(self):
     self.set_setting('MAIN_MODULE', 2)
     self.do_core_test('test_hello_world.c')