wasm2js: Have instantiate function take standard import object (#5018)

Previously we were assuming asmLibraryArg which is what emscripten
passes as the `env` import object but using this method is more
flexible and should allow wasm2js to work with import that are
not all form a single object.

The slight size increase here is just temporary until emscripten
gets updated.

See https://github.com/emscripten-core/emscripten/pull/17737

1 files changed, 4 insertions, 3 deletions

diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js.opt b/test/wasm2js/emscripten-grow-yes.2asm.js.opt
index 6f02ce3cc..4167e7741 100644
--- a/test/wasm2js/emscripten-grow-yes.2asm.js.opt
+++ b/test/wasm2js/emscripten-grow-yes.2asm.js.opt
@@ -1,4 +1,4 @@
-function instantiate(asmLibraryArg) {
+function instantiate(info) {
   var bufferView;
   var base64ReverseLookup = new Uint8Array(123/*'z'+1*/);
   for (var i = 25; i >= 0; --i) {
@@ -23,7 +23,8 @@ function instantiate(asmLibraryArg) {
 function initActiveSegments(imports) {
   base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj");
 }
-function asmFunc(env) {
+function asmFunc(importObject) {
+ var env = importObject.env || importObject;
  var memory = env.memory;
  var buffer = memory.buffer;
  memory.grow = __wasm_memory_grow;
@@ -101,5 +102,5 @@ function asmFunc(env) {
  };
 }
 
-  return asmFunc(asmLibraryArg);
+  return asmFunc(info);
 }