wasm2js: Emit table in a way that is friendly to emscripten minification (#2102)

Set it to a local in the asmFunc scope, so that minifiers can easily see it's a simple local value (instead of using it as an upvar from the parameters higher up, which was how the emscripten glue was emitting it).

2 files changed, 4 insertions, 2 deletions

diff --git a/test/wasm2js/emscripten.2asm.js b/test/wasm2js/emscripten.2asm.js
index 91838daf9..1d8de170a 100644
--- a/test/wasm2js/emscripten.2asm.js
+++ b/test/wasm2js/emscripten.2asm.js
@@ -1,8 +1,9 @@
-function instantiate(asmLibraryArg, wasmMemory, FUNCTION_TABLE) {
+function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
  "almost asm";
  var memory = env.memory;
+ var FUNCTION_TABLE = wasmTable;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);
diff --git a/test/wasm2js/emscripten.2asm.js.opt b/test/wasm2js/emscripten.2asm.js.opt
index 0c0a295e1..58c6b1c0c 100644
--- a/test/wasm2js/emscripten.2asm.js.opt
+++ b/test/wasm2js/emscripten.2asm.js.opt
@@ -1,8 +1,9 @@
-function instantiate(asmLibraryArg, wasmMemory, FUNCTION_TABLE) {
+function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
  "almost asm";
  var memory = env.memory;
+ var FUNCTION_TABLE = wasmTable;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);