From f0d6b089960e089bcc5c1794003585ebbd91d33a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 11 Nov 2020 15:50:33 -0800 Subject: wasm2js: Declare data segments before calling asmFunc (#3337) This is because we maybe need to reference the segments during the start function. For example in the case of pthreads we conditionally load passive segments during start. Tested in emscripten with: tests/runner.py wasm2js1 --- test/wasm2js/start_func.2asm.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'test/wasm2js/start_func.2asm.js') diff --git a/test/wasm2js/start_func.2asm.js b/test/wasm2js/start_func.2asm.js index 70b3458fe..f3694708a 100644 --- a/test/wasm2js/start_func.2asm.js +++ b/test/wasm2js/start_func.2asm.js @@ -9,7 +9,6 @@ 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; @@ -49,7 +48,6 @@ function asmFunc(env) { HEAPF32 = new Float32Array(newBuffer); HEAPF64 = new Float64Array(newBuffer); buffer = newBuffer; - bufferView = HEAPU8; } return oldPages; } @@ -59,6 +57,5 @@ function asmFunc(env) { }; } -var bufferView; var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } }); -- cgit v1.2.3