[wasm64] Fix argv setup code for wasm64 (#16943)

Use makeGetValue/makeSetValue over direct heap manipulation in
order to make the code compatible with both wasm64 and wasm32.

Author: sbc100

.circleci/config.yml

@@ -381,7 +381,7 @@ jobs:
     executor: bionic
     steps:
       - run-tests-linux:
-          test_targets: "wasm64.test_hello_world wasm64.test_ccall wasm64l.test_hello_world wasm64l.test_mmap wasm64l.test_unistd_* skip:wasm64l.test_unistd_sysconf wasm64l.test_mmap_file wasm64l.test_ccall wasm64l.test_signals wasm64l.test_emscripten_get_compiler_setting wasm64l.test_float_builtins"
+          test_targets: "wasm64.test_hello_world wasm64.test_ccall wasm64l.test_hello_world wasm64l.test_mmap wasm64l.test_unistd_* skip:wasm64l.test_unistd_sysconf wasm64l.test_mmap_file wasm64l.test_ccall wasm64l.test_signals wasm64l.test_emscripten_get_compiler_setting wasm64l.test_float_builtins wasm64l.test_getopt"
   test-other:
     executor: bionic
     steps:

src/parseTools.js

@@ -177,8 +177,12 @@ function needsQuoting(ident) {
 const POINTER_SIZE = MEMORY64 ? 8 : 4;
 const POINTER_BITS = POINTER_SIZE * 8;
 const POINTER_TYPE = 'u' + POINTER_BITS;
+const POINTER_SHIFT = MEMORY64 ? '3' : '2';
+const POINTER_HEAP = MEMORY64 ? 'HEAP64' : 'HEAP32';
+
 const SIZE_TYPE = POINTER_TYPE;
 
+
 // Similar to POINTER_TYPE, but this is the actual wasm type that is
 // used in practice, while POINTER_TYPE is the more refined internal
 // type (that is unsigned, where as core wasm does not have unsigned

src/postamble.js

@@ -147,14 +147,15 @@ function callMain(args) {
   mainArgs = [thisProgram].concat(args)
 #elif MAIN_READS_PARAMS
   args = args || [];
+  args.unshift(thisProgram);
 
-  var argc = args.length+1;
+  var argc = args.length;
   var argv = stackAlloc((argc + 1) * {{{ Runtime.POINTER_SIZE }}});
-  HEAP32[argv >> 2] = allocateUTF8OnStack(thisProgram);
-  for (var i = 1; i < argc; i++) {
-    HEAP32[(argv >> 2) + i] = allocateUTF8OnStack(args[i - 1]);
-  }
-  HEAP32[(argv >> 2) + argc] = 0;
+  var argv_ptr = argv >> {{{ POINTER_SHIFT }}};
+  args.forEach((arg) => {
+    {{{ POINTER_HEAP }}}[argv_ptr++] = {{{ to64('allocateUTF8OnStack(arg)') }}};
+  });
+  {{{ POINTER_HEAP }}}[argv_ptr] = {{{ to64('0') }}};
 #else
   var argc = 0;
   var argv = 0;

tests/other/metadce/test_metadce_hello_O0.jssize

@@ -1 +1 @@
-27065
+27005

tests/other/metadce/test_metadce_hello_main_module_2.jssize

@@ -1 +1 @@
-27394
+27385

tests/other/metadce/test_metadce_mem_O3.jssize

@@ -1 +1 @@
-6371
+6386

tests/other/metadce/test_metadce_mem_O3_grow.jssize

@@ -1 +1 @@
-6701
+6717