MINIMAL_RUNTIME: Always declare wasmExports globally

This simplifies the code and makes MINIMAL_RUNTIME behave more like
the regular runtime.   It also allows
`-sEXPORTED_RUNTIME_METHODS=wasmExports`, which doesn't work without
this.

This also matches the way we handle other globals such as `wasmTable`
and `wasmMemory`.

This save a few bytes of code size in some tests and cost a few in
others so on average I would say this code size neutral.

Fixes: #20145

Author: sbc100

src/postamble_minimal.js

@@ -48,7 +48,7 @@ function run() {
 }
 #endif
 
-function initRuntime(wasmExports) {
+function initRuntime() {
 #if ASSERTIONS || SAFE_HEAP || USE_ASAN
   runtimeInitialized = true;
 #endif
@@ -140,12 +140,6 @@ if (!Module['wasm']) throw 'Must load WebAssembly Module in to variable Module.w
 WebAssembly.instantiate(Module['wasm'], imports).then((output) => {
 #endif
 
-#if !LibraryManager.has('library_exports.js') && !EMBIND
-  // If not using the emscripten_get_exported_function() API or embind, keep the
-  // `wasmExports` variable in local scope to this instantiate function to save
-  // code size.  (otherwise access it without to export it to outer scope)
-  var
-#endif
   // WebAssembly instantiation API gotcha: if Module['wasm'] above was a typed
   // array, then the output object will have an output.instance and
   // output.module objects. But if Module['wasm'] is an already compiled
@@ -226,7 +220,7 @@ WebAssembly.instantiate(Module['wasm'], imports).then((output) => {
   HEAPU8.set(new Uint8Array(Module['mem']), {{{ GLOBAL_BASE }}});
 #endif
 
-  initRuntime(wasmExports);
+  initRuntime();
 #if PTHREADS
   // Export Wasm module for pthread creation to access.
   wasmModule = output.module || Module['wasm'];

src/preamble_minimal.js

@@ -67,7 +67,7 @@ var HEAP8, HEAP16, HEAP32, HEAPU8, HEAPU16, HEAPU32, HEAPF32, HEAPF64,
 #if SUPPORT_BIG_ENDIAN
   HEAP_DATA_VIEW,
 #endif
-  wasmMemory, wasmTable;
+  wasmMemory, wasmTable, wasmExports;
 
 function updateMemoryViews() {
   var b = wasmMemory.buffer;

test/code_size/hello_wasm_worker_wasm.js

@@ -1,35 +1,35 @@
-var b = Module, c = b.$ww, f, e = b.mem || new WebAssembly.Memory({
+var b = Module, c = b.$ww, f, g, e = b.mem || new WebAssembly.Memory({
     initial: 256,
     maximum: 256,
     shared: !0
-}), g = e.buffer, h = [], k = a => {
+}), h = e.buffer, k = [], l = a => {
     a = a.data;
     let d = a._wsc;
     d && f.get(d)(...a.x);
-}, l = a => {
-    h.push(a);
-}, m = {}, n = 1, p, q;
+}, m = a => {
+    k.push(a);
+}, n = {}, p = 1, q, r;
 
-c && (m[0] = this, addEventListener("message", l));
+c && (n[0] = this, addEventListener("message", m));
 
 WebAssembly.instantiate(b.wasm, {
     a: {
         b: (a, d) => {
-            let r = m[n] = new Worker(b.$wb);
-            r.postMessage({
-                $ww: n,
+            let t = n[p] = new Worker(b.$wb);
+            t.postMessage({
+                $ww: p,
                 wasm: b.wasm,
                 js: b.js,
                 mem: e,
                 sb: a,
                 sz: d
             });
-            r.onmessage = k;
-            return n++;
+            t.onmessage = l;
+            return p++;
         },
         c: () => !1,
         d: (a, d) => {
-            m[a].postMessage({
+            n[a].postMessage({
                 _wsc: d,
                 x: []
             });
@@ -40,11 +40,11 @@ WebAssembly.instantiate(b.wasm, {
         a: e
     }
 }).then((a => {
-    a = a.instance.exports;
-    p = a.g;
-    q = a.i;
-    f = a.h;
-    c ? (a = b, q(a.sb, a.sz), removeEventListener("message", l), h = h.forEach(k), 
-    addEventListener("message", k)) : a.f();
-    c || p();
+    g = a.instance.exports;
+    q = g.g;
+    r = g.i;
+    f = g.h;
+    c ? (a = b, r(a.sb, a.sz), removeEventListener("message", m), k = k.forEach(l), 
+    addEventListener("message", l)) : g.f();
+    c || q();
 }));

test/code_size/hello_wasm_worker_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 737,
   "a.html.gz": 433,
-  "a.js": 667,
-  "a.js.gz": 458,
+  "a.js": 669,
+  "a.js.gz": 462,
   "a.wasm": 1862,
   "a.wasm.gz": 1040,
-  "total": 3266,
-  "total_gz": 1931
+  "total": 3268,
+  "total_gz": 1935
 }

test/code_size/hello_webgl2_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 569,
   "a.html.gz": 379,
-  "a.js": 4700,
-  "a.js.gz": 2417,
+  "a.js": 4698,
+  "a.js.gz": 2426,
   "a.wasm": 10479,
   "a.wasm.gz": 6713,
-  "total": 15748,
-  "total_gz": 9509
+  "total": 15746,
+  "total_gz": 9518
 }

test/code_size/hello_webgl2_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 567,
   "a.html.gz": 379,
-  "a.js": 17975,
-  "a.js.gz": 8044,
+  "a.js": 17982,
+  "a.js.gz": 8052,
   "a.mem": 3171,
   "a.mem.gz": 2713,
-  "total": 21713,
-  "total_gz": 11136
+  "total": 21720,
+  "total_gz": 11144
 }

test/code_size/hello_webgl_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 569,
   "a.html.gz": 379,
-  "a.js": 4186,
-  "a.js.gz": 2244,
+  "a.js": 4184,
+  "a.js.gz": 2250,
   "a.wasm": 10479,
   "a.wasm.gz": 6713,
-  "total": 15234,
-  "total_gz": 9336
+  "total": 15232,
+  "total_gz": 9342
 }

test/code_size/hello_webgl_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 567,
   "a.html.gz": 379,
-  "a.js": 17454,
-  "a.js.gz": 7873,
+  "a.js": 17461,
+  "a.js.gz": 7878,
   "a.mem": 3171,
   "a.mem.gz": 2713,
-  "total": 21192,
-  "total_gz": 10965
+  "total": 21199,
+  "total_gz": 10970
 }

test/code_size/hello_world_wasm.js

@@ -1,21 +1,22 @@
-var d = Module, e, f, g = new TextDecoder("utf8"), h;
+var b = Module, d, e, f, g = new TextDecoder("utf8"), k;
 
-WebAssembly.instantiate(d.wasm, {
+WebAssembly.instantiate(b.wasm, {
     a: {
         a: a => {
-            var c = console, k = c.log;
+            var h = console, l = h.log;
             if (a) {
-                for (var l = a + void 0, b = a; !(b >= l) && e[b]; ) ++b;
-                a = g.decode(e.subarray(a, b));
+                for (var m = a + void 0, c = a; !(c >= m) && d[c]; ) ++c;
+                a = g.decode(d.subarray(a, c));
             } else a = "";
-            k.call(c, a);
+            l.call(h, a);
         }
     }
 }).then((a => {
-    a = a.instance.exports;
-    h = a.d;
-    f = a.b;
-    e = new Uint8Array(f.buffer);
-    a.c();
-    h();
+    f = a.instance.exports;
+    k = f.d;
+    e = f.b;
+    a = e.buffer;
+    d = new Uint8Array(a);
+    f.c();
+    k();
 }));

test/code_size/hello_world_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 673,
   "a.html.gz": 431,
-  "a.js": 292,
-  "a.js.gz": 252,
+  "a.js": 298,
+  "a.js.gz": 256,
   "a.wasm": 103,
   "a.wasm.gz": 112,
-  "total": 1068,
-  "total_gz": 795
+  "total": 1074,
+  "total_gz": 799
 }

test/code_size/hello_world_wasm2js.js

@@ -1,15 +1,15 @@
-var b = Module, g = new function(a) {
+var b = Module, h, g = new function(a) {
     this.buffer = new ArrayBuffer(65536 * a.initial);
 }({
     initial: 256,
     maximum: 256
-}), k = g.buffer, d = new Uint8Array(k), l = new TextDecoder("utf8"), m;
+}), l = g.buffer, d = new Uint8Array(l), m = new TextDecoder("utf8"), n;
 
 function c(a) {
-    this.exports = function(h) {
-        function n(f) {
-            f.set = function(e, p) {
-                this[e] = p;
+    this.exports = function(k) {
+        function p(f) {
+            f.set = function(e, q) {
+                this[e] = q;
             };
             f.get = function(e) {
                 return this[e];
@@ -20,40 +20,40 @@ function c(a) {
             var e = f.a.a;
             return {
                 b: function() {},
-                c: function(p, q) {
+                c: function(q, r) {
                     e(1024);
                     return 0;
                 },
-                d: n([])
+                d: p([])
             };
-        }(h);
+        }(k);
     }(a);
 }
 
-(function(a, h) {
+(function(a, k) {
     return {
-        then: function(n) {
-            n({
-                instance: new c(h)
+        then: function(p) {
+            p({
+                instance: new c(k)
             });
         }
     };
 })(b.wasm, {
     a: {
         a: a => {
-            var h = console, n = h.log;
+            var k = console, p = k.log;
             if (a) {
                 for (var f = a + void 0, e = a; !(e >= f) && d[e]; ) ++e;
-                a = l.decode(d.subarray(a, e));
+                a = m.decode(d.subarray(a, e));
             } else a = "";
-            n.call(h, a);
+            p.call(k, a);
         },
         memory: g
     }
 }).then((a => {
-    a = a.instance.exports;
-    m = a.c;
+    h = a.instance.exports;
+    n = h.c;
     d.set(new Uint8Array(b.mem), 1024);
-    a.b();
-    m();
+    h.b();
+    n();
 }));

test/code_size/hello_world_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 671,
   "a.html.gz": 430,
-  "a.js": 694,
-  "a.js.gz": 433,
+  "a.js": 696,
+  "a.js.gz": 436,
   "a.mem": 6,
   "a.mem.gz": 32,
-  "total": 1371,
-  "total_gz": 895
+  "total": 1373,
+  "total_gz": 898
 }

test/code_size/math_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 673,
   "a.html.gz": 431,
-  "a.js": 111,
+  "a.js": 113,
   "a.js.gz": 127,
   "a.wasm": 2727,
   "a.wasm.gz": 1673,
-  "total": 3511,
+  "total": 3513,
   "total_gz": 2231
 }

test/code_size/random_printf_wasm.json

@@ -1,6 +1,6 @@
 {
-  "a.html": 12774,
-  "a.html.gz": 6965,
-  "total": 12774,
-  "total_gz": 6965
+  "a.html": 12772,
+  "a.html.gz": 6969,
+  "total": 12772,
+  "total_gz": 6969
 }

test/code_size/random_printf_wasm2js.json

@@ -1,6 +1,6 @@
 {
-  "a.html": 17351,
-  "a.html.gz": 7549,
-  "total": 17351,
-  "total_gz": 7549
+  "a.html": 17353,
+  "a.html.gz": 7553,
+  "total": 17353,
+  "total_gz": 7553
 }

test/other/metadce/test_metadce_minimal_Os_mr.jssize

@@ -1 +1 @@
-409
+407