wasm2js: Support for exported memory (#3323)

The asmFunc now sets the outer scope's `bufferView` variable
as well as its own internal views.

1 files changed, 5 insertions, 4 deletions

diff --git a/test/wasm2js/emscripten-grow-no.2asm.js.opt b/test/wasm2js/emscripten-grow-no.2asm.js.opt
index 37d1b31ad..898faa539 100644
--- a/test/wasm2js/emscripten-grow-no.2asm.js.opt
+++ b/test/wasm2js/emscripten-grow-no.2asm.js.opt
@@ -1,4 +1,4 @@
-function instantiate(asmLibraryArg, wasmMemory) {
+function instantiate(asmLibraryArg) {
 function asmFunc(env) {
  var memory = env.memory;
  var buffer = memory.buffer;
@@ -10,6 +10,7 @@ function asmFunc(env) {
  var HEAPU32 = new Uint32Array(buffer);
  var HEAPF32 = new Float32Array(buffer);
  var HEAPF64 = new Float64Array(buffer);
+ bufferView = HEAPU8;
  var Math_imul = Math.imul;
  var Math_fround = Math.fround;
  var Math_abs = Math.abs;
@@ -46,7 +47,8 @@ function asmFunc(env) {
  };
 }
 
-var bufferView = new Uint8Array(wasmMemory.buffer);
+var bufferView;
+var exports = asmFunc(asmLibraryArg);
 for (var base64ReverseLookup = new Uint8Array(123/*'z'+1*/), i = 25; i >= 0; --i) {
     base64ReverseLookup[48+i] = 52+i; // '0-9'
     base64ReverseLookup[65+i] = i; // 'A-Z'
@@ -67,6 +69,5 @@ for (var base64ReverseLookup = new Uint8Array(123/*'z'+1*/), i = 25; i >= 0; --i
     return uint8Array;
   }
   base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj");
-return asmFunc(asmLibraryArg, wasmMemory.buffer)
-
+return exports;
 }
\ No newline at end of file