diff options
Diffstat (limited to 'test')
119 files changed, 373 insertions, 541 deletions
diff --git a/test/binaryen.js/emit_asmjs.js.txt b/test/binaryen.js/emit_asmjs.js.txt index 2d9a18331..a91383f7b 100644 --- a/test/binaryen.js/emit_asmjs.js.txt +++ b/test/binaryen.js/emit_asmjs.js.txt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function main($0) { @@ -24,7 +23,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var main = retasmFunc.main; diff --git a/test/passes/remove-non-js-ops.txt b/test/passes/remove-non-js-ops.txt index f7ac70d91..d3fa090a5 100644 --- a/test/passes/remove-non-js-ops.txt +++ b/test/passes/remove-non-js-ops.txt @@ -17,6 +17,7 @@ (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32))) (type $i32_i32_i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32 i32 i32) (result i32))) (type $none_=>_i32 (func (result i32))) + (type $none_=>_none (func)) (import "env" "wasm2js_scratch_load_i32" (func $wasm2js_scratch_load_i32 (param i32) (result i32))) (import "env" "wasm2js_scratch_store_i32" (func $wasm2js_scratch_store_i32 (param i32 i32))) (import "env" "wasm2js_scratch_load_f32" (func $wasm2js_scratch_load_f32 (result f32))) @@ -30,6 +31,7 @@ (import "env" "wasm2js_atomic_wait_i32" (func $wasm2js_atomic_wait_i32 (param i32 i32 i32 i32) (result i32))) (import "env" "wasm2js_atomic_rmw_i64" (func $wasm2js_atomic_rmw_i64 (param i32 i32 i32 i32 i32 i32) (result i32))) (import "env" "wasm2js_get_stashed_bits" (func $wasm2js_get_stashed_bits (result i32))) + (import "env" "wasm2js_trap" (func $wasm2js_trap)) (global $__wasm-intrinsics-temp-i64 (mut i64) (i64.const 0)) (memory $0 1) (func $copysign64 (param $0 f64) (param $1 f64) (result f64) diff --git a/test/wasm2js.asserts.js b/test/wasm2js.asserts.js index b3cf64d4c..e04de2990 100644 --- a/test/wasm2js.asserts.js +++ b/test/wasm2js.asserts.js @@ -42,7 +42,6 @@ function asmFunc0(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -68,8 +67,8 @@ function asmFunc0(importObject) { }; } -var retasmFunc0 = asmFunc0( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc0 = asmFunc0({ +}); function check1() { retasmFunc0.empty(); return 1 | 0; diff --git a/test/wasm2js.traps.js b/test/wasm2js.traps.js index 350f55947..31d9557e0 100644 --- a/test/wasm2js.traps.js +++ b/test/wasm2js.traps.js @@ -42,7 +42,6 @@ function asmFunc0(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -68,8 +67,8 @@ function asmFunc0(importObject) { }; } -var retasmFunc0 = asmFunc0( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc0 = asmFunc0({ +}); function check1() { retasmFunc0.empty(); return 1 | 0; diff --git a/test/wasm2js/add_div.2asm.js b/test/wasm2js/add_div.2asm.js index def3ae357..ff9bdc01c 100644 --- a/test/wasm2js/add_div.2asm.js +++ b/test/wasm2js/add_div.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo($0) { @@ -24,6 +23,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/add_div.2asm.js.opt b/test/wasm2js/add_div.2asm.js.opt index edf698e20..142330e02 100644 --- a/test/wasm2js/add_div.2asm.js.opt +++ b/test/wasm2js/add_div.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo($0) { @@ -24,6 +23,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/atomic_fence.2asm.js b/test/wasm2js/atomic_fence.2asm.js index fb64bda35..efe176159 100644 --- a/test/wasm2js/atomic_fence.2asm.js +++ b/test/wasm2js/atomic_fence.2asm.js @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -57,6 +56,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var atomic_fence = retasmFunc.atomic_fence; diff --git a/test/wasm2js/atomic_fence.2asm.js.opt b/test/wasm2js/atomic_fence.2asm.js.opt index eb4e06541..543f6b6cc 100644 --- a/test/wasm2js/atomic_fence.2asm.js.opt +++ b/test/wasm2js/atomic_fence.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var atomic_fence = retasmFunc.atomic_fence; diff --git a/test/wasm2js/atomics_32.2asm.js b/test/wasm2js/atomics_32.2asm.js index a7322cceb..6d97947ba 100644 --- a/test/wasm2js/atomics_32.2asm.js +++ b/test/wasm2js/atomics_32.2asm.js @@ -24,11 +24,6 @@ memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "aGVsbG8s"); memorySegments[1] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "d29ybGQh"); - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_atomic_wait_i32(ptr, expected, timeoutLow, timeoutHigh) { var timeout = Infinity; if (timeoutHigh >= 0) { @@ -115,7 +110,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -159,6 +153,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var test = retasmFunc.test; diff --git a/test/wasm2js/atomics_32.2asm.js.opt b/test/wasm2js/atomics_32.2asm.js.opt index 0810affa3..0a7e3a252 100644 --- a/test/wasm2js/atomics_32.2asm.js.opt +++ b/test/wasm2js/atomics_32.2asm.js.opt @@ -24,11 +24,6 @@ memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "aGVsbG8s"); memorySegments[1] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "d29ybGQh"); - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_atomic_wait_i32(ptr, expected, timeoutLow, timeoutHigh) { var timeout = Infinity; if (timeoutHigh >= 0) { @@ -115,7 +110,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -155,6 +149,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var test = retasmFunc.test; diff --git a/test/wasm2js/base64.2asm.js b/test/wasm2js/base64.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/base64.2asm.js +++ b/test/wasm2js/base64.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/base64.2asm.js.opt b/test/wasm2js/base64.2asm.js.opt index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/base64.2asm.js.opt +++ b/test/wasm2js/base64.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js index c31ff032c..9e2c48d63 100644 --- a/test/wasm2js/br.2asm.js +++ b/test/wasm2js/br.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -717,9 +716,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32; diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js index 8ca71f287..dbc584ddb 100644 --- a/test/wasm2js/br_table.2asm.js +++ b/test/wasm2js/br_table.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -13422,9 +13421,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32; diff --git a/test/wasm2js/br_table_hoisting.2asm.js b/test/wasm2js/br_table_hoisting.2asm.js index 091c669b4..8a4fad19d 100644 --- a/test/wasm2js/br_table_hoisting.2asm.js +++ b/test/wasm2js/br_table_hoisting.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function zed($0) { @@ -178,8 +177,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo1 = retasmFunc.foo1; export var foo2 = retasmFunc.foo2; export var foo3 = retasmFunc.foo3; diff --git a/test/wasm2js/br_table_hoisting.2asm.js.opt b/test/wasm2js/br_table_hoisting.2asm.js.opt index 81e25acb8..3966c2b28 100644 --- a/test/wasm2js/br_table_hoisting.2asm.js.opt +++ b/test/wasm2js/br_table_hoisting.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function zed($0) { @@ -168,8 +167,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo1 = retasmFunc.foo1; export var foo2 = retasmFunc.foo2; export var foo3 = retasmFunc.foo3; diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js index d45976452..2c81be4e1 100644 --- a/test/wasm2js/br_table_temp.2asm.js +++ b/test/wasm2js/br_table_temp.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function dummy() { @@ -13265,8 +13264,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32; diff --git a/test/wasm2js/br_table_temp.2asm.js.opt b/test/wasm2js/br_table_temp.2asm.js.opt index 7a3da66b9..d1407a51d 100644 --- a/test/wasm2js/br_table_temp.2asm.js.opt +++ b/test/wasm2js/br_table_temp.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function dummy() { @@ -12686,8 +12685,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32; diff --git a/test/wasm2js/br_table_to_loop.2asm.js b/test/wasm2js/br_table_to_loop.2asm.js index 419b0e10f..9d318bf4d 100644 --- a/test/wasm2js/br_table_to_loop.2asm.js +++ b/test/wasm2js/br_table_to_loop.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -42,7 +41,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var exp1 = retasmFunc.exp1; export var exp2 = retasmFunc.exp2; diff --git a/test/wasm2js/br_table_to_loop.2asm.js.opt b/test/wasm2js/br_table_to_loop.2asm.js.opt index 2bd56bfa5..fb8e7f956 100644 --- a/test/wasm2js/br_table_to_loop.2asm.js.opt +++ b/test/wasm2js/br_table_to_loop.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -28,7 +27,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var exp1 = retasmFunc.exp1; export var exp2 = retasmFunc.exp2; diff --git a/test/wasm2js/break-drop.2asm.js b/test/wasm2js/break-drop.2asm.js index c103a0397..2954ee937 100644 --- a/test/wasm2js/break-drop.2asm.js +++ b/test/wasm2js/break-drop.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -33,8 +32,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var br = retasmFunc.br; export var br_if = retasmFunc.br_if; export var br_table = retasmFunc.br_table; diff --git a/test/wasm2js/bulk-memory.2asm.js b/test/wasm2js/bulk-memory.2asm.js index 4ba96d034..3712f6a10 100644 --- a/test/wasm2js/bulk-memory.2asm.js +++ b/test/wasm2js/bulk-memory.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,16 +18,11 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); var bufferView; - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_fill(dest, value, size) { dest = dest >>> 0; size = size >>> 0; @@ -57,7 +51,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -105,8 +98,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var fill = retasmFunc.fill; export var load8_u = retasmFunc.load8_u; @@ -135,11 +128,6 @@ function initActiveSegments(imports) { base64DecodeToExistingUint8Array(bufferView, 0, "qrvM3Q=="); } - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_copy(dest, source, size) { // TODO: traps on invalid things bufferView.copyWithin(dest, source, source + size); @@ -166,7 +154,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -193,8 +180,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var copy = retasmFunc.copy; export var load8_u = retasmFunc.load8_u; @@ -222,11 +209,6 @@ export var load8_u = retasmFunc.load8_u; } memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(4), 0, "qrvM3Q=="); - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_init(segment, dest, offset, size) { // TODO: traps on invalid things bufferView.set(memorySegments[segment].subarray(offset, offset + size), dest); @@ -253,7 +235,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -301,8 +282,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var init = retasmFunc.init; export var load8_u = retasmFunc.load8_u; @@ -333,11 +314,6 @@ function initActiveSegments(imports) { base64DecodeToExistingUint8Array(bufferView, 0, ""); } - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_data_drop(segment) { // TODO: traps on invalid things memorySegments[segment] = new Uint8Array(0); @@ -369,7 +345,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -424,8 +399,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var drop_passive = retasmFunc.drop_passive; export var init_passive = retasmFunc.init_passive; export var drop_active = retasmFunc.drop_active; diff --git a/test/wasm2js/bulk-memory.2asm.js.opt b/test/wasm2js/bulk-memory.2asm.js.opt index d6a690909..eb58d1556 100644 --- a/test/wasm2js/bulk-memory.2asm.js.opt +++ b/test/wasm2js/bulk-memory.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,16 +18,11 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); var bufferView; - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_fill(dest, value, size) { dest = dest >>> 0; size = size >>> 0; @@ -57,7 +51,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -105,8 +98,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var fill = retasmFunc.fill; export var load8_u = retasmFunc.load8_u; @@ -135,11 +128,6 @@ function initActiveSegments(imports) { base64DecodeToExistingUint8Array(bufferView, 0, "qrvM3Q=="); } - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_copy(dest, source, size) { // TODO: traps on invalid things bufferView.copyWithin(dest, source, source + size); @@ -166,7 +154,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -193,8 +180,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var copy = retasmFunc.copy; export var load8_u = retasmFunc.load8_u; @@ -222,11 +209,6 @@ export var load8_u = retasmFunc.load8_u; } memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(4), 0, "qrvM3Q=="); - var scratchBuffer = new ArrayBuffer(16); - var i32ScratchView = new Int32Array(scratchBuffer); - var f32ScratchView = new Float32Array(scratchBuffer); - var f64ScratchView = new Float64Array(scratchBuffer); - function wasm2js_memory_init(segment, dest, offset, size) { // TODO: traps on invalid things bufferView.set(memorySegments[segment].subarray(offset, offset + size), dest); @@ -253,7 +235,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1, $1_1, $2) { @@ -301,11 +282,14 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var init = retasmFunc.init; export var load8_u = retasmFunc.load8_u; + var bufferView; +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); @@ -327,7 +311,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -336,10 +319,11 @@ function asmFunc(importObject) { function $1() { if (__wasm_memory_size() << 16 >>> 0 < 0) { - abort() + wasm2js_trap() } } + bufferView = HEAPU8; function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -361,6 +345,7 @@ function asmFunc(importObject) { HEAPF32 = new Float32Array(newBuffer); HEAPF64 = new Float64Array(newBuffer); buffer = newBuffer; + bufferView = HEAPU8; } return oldPages; } @@ -373,8 +358,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var drop_passive = retasmFunc.drop_passive; export var init_passive = retasmFunc.init_passive; export var drop_active = retasmFunc.drop_active; diff --git a/test/wasm2js/comments.2asm.js b/test/wasm2js/comments.2asm.js index 25508ff66..9eab5c8c1 100644 --- a/test/wasm2js/comments.2asm.js +++ b/test/wasm2js/comments.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,8 +18,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); function asmFunc(importObject) { var env = importObject.env || importObject; @@ -34,7 +33,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -42,5 +40,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/conversions-modified.2asm.js b/test/wasm2js/conversions-modified.2asm.js index 33986c906..cfc407353 100644 --- a/test/wasm2js/conversions-modified.2asm.js +++ b/test/wasm2js/conversions-modified.2asm.js @@ -42,7 +42,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -620,9 +619,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i64_extend_s_i32 = retasmFunc.i64_extend_s_i32; export var i64_extend_u_i32 = retasmFunc.i64_extend_u_i32; export var i32_wrap_i64 = retasmFunc.i32_wrap_i64; diff --git a/test/wasm2js/conversions-modified.2asm.js.opt b/test/wasm2js/conversions-modified.2asm.js.opt index 434f6df30..97ad69028 100644 --- a/test/wasm2js/conversions-modified.2asm.js.opt +++ b/test/wasm2js/conversions-modified.2asm.js.opt @@ -42,7 +42,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -197,9 +196,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i64_extend_s_i32 = retasmFunc.i64_extend_s_i32; export var i64_extend_u_i32 = retasmFunc.i64_extend_u_i32; export var i32_wrap_i64 = retasmFunc.i32_wrap_i64; diff --git a/test/wasm2js/deterministic.2asm.js b/test/wasm2js/deterministic.2asm.js index 9cb65651c..2fd378080 100644 --- a/test/wasm2js/deterministic.2asm.js +++ b/test/wasm2js/deterministic.2asm.js @@ -1,4 +1,7 @@ + var bufferView; +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var memory = env.memory; @@ -21,17 +24,17 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var global$0 = -44; function $0() { if ((global$0 >>> 0) / ((HEAP32[0 >> 2] | 0) >>> 0) | 0) { - abort() + wasm2js_trap() } return 1 | 0; } + bufferView = HEAPU8; function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -42,7 +45,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(65536); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ memory: { buffer : memasmFunc } - }); +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/deterministic.2asm.js.opt b/test/wasm2js/deterministic.2asm.js.opt index 6f6be3f85..4c9e0a139 100644 --- a/test/wasm2js/deterministic.2asm.js.opt +++ b/test/wasm2js/deterministic.2asm.js.opt @@ -1,4 +1,7 @@ + var bufferView; +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var memory = env.memory; @@ -21,16 +24,16 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { if (4294967252 / HEAPU32[0] | 0) { - abort() + wasm2js_trap() } return 1; } + bufferView = HEAPU8; function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -41,7 +44,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(65536); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ memory: { buffer : memasmFunc } - }); +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/dot_import.2asm.js b/test/wasm2js/dot_import.2asm.js index da0cfb125..d49304e2d 100644 --- a/test/wasm2js/dot_import.2asm.js +++ b/test/wasm2js/dot_import.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var base = env.ba_se; @@ -25,7 +24,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - ba_se - }); +var retasmFunc = asmFunc({ + ba_se, +}); export var exported = retasmFunc.exported; diff --git a/test/wasm2js/dot_import.2asm.js.opt b/test/wasm2js/dot_import.2asm.js.opt index da0cfb125..d49304e2d 100644 --- a/test/wasm2js/dot_import.2asm.js.opt +++ b/test/wasm2js/dot_import.2asm.js.opt @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var base = env.ba_se; @@ -25,7 +24,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - ba_se - }); +var retasmFunc = asmFunc({ + ba_se, +}); export var exported = retasmFunc.exported; diff --git a/test/wasm2js/dynamicLibrary.2asm.js b/test/wasm2js/dynamicLibrary.2asm.js index 0a8866445..93faf062b 100644 --- a/test/wasm2js/dynamicLibrary.2asm.js +++ b/test/wasm2js/dynamicLibrary.2asm.js @@ -58,7 +58,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var import$memoryBase = env.memoryBase | 0; @@ -91,7 +90,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(16777216); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ memory: { buffer : memasmFunc } - }); +}); export var baz = retasmFunc.baz; diff --git a/test/wasm2js/dynamicLibrary.2asm.js.opt b/test/wasm2js/dynamicLibrary.2asm.js.opt index 9c418ffd3..44b3411a0 100644 --- a/test/wasm2js/dynamicLibrary.2asm.js.opt +++ b/test/wasm2js/dynamicLibrary.2asm.js.opt @@ -58,7 +58,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var import$memoryBase = env.memoryBase | 0; @@ -83,7 +82,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(16777216); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ memory: { buffer : memasmFunc } - }); +}); export var baz = retasmFunc.baz; diff --git a/test/wasm2js/empty_export.2asm.js b/test/wasm2js/empty_export.2asm.js index 8ecf44c0b..eb162b810 100644 --- a/test/wasm2js/empty_export.2asm.js +++ b/test/wasm2js/empty_export.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo() { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var $ = retasmFunc.$; diff --git a/test/wasm2js/empty_export.2asm.js.opt b/test/wasm2js/empty_export.2asm.js.opt index 8ecf44c0b..eb162b810 100644 --- a/test/wasm2js/empty_export.2asm.js.opt +++ b/test/wasm2js/empty_export.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo() { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var $ = retasmFunc.$; diff --git a/test/wasm2js/empty_table.2asm.js b/test/wasm2js/empty_table.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/empty_table.2asm.js +++ b/test/wasm2js/empty_table.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/emscripten-grow-no.2asm.js b/test/wasm2js/emscripten-grow-no.2asm.js index 8176105dd..68ffdbe2c 100644 --- a/test/wasm2js/emscripten-grow-no.2asm.js +++ b/test/wasm2js/emscripten-grow-no.2asm.js @@ -45,7 +45,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; // EMSCRIPTEN_START_FUNCS diff --git a/test/wasm2js/emscripten-grow-no.2asm.js.opt b/test/wasm2js/emscripten-grow-no.2asm.js.opt index 8176105dd..68ffdbe2c 100644 --- a/test/wasm2js/emscripten-grow-no.2asm.js.opt +++ b/test/wasm2js/emscripten-grow-no.2asm.js.opt @@ -45,7 +45,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; // EMSCRIPTEN_START_FUNCS diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js b/test/wasm2js/emscripten-grow-yes.2asm.js index 4167e7741..68a8c556c 100644 --- a/test/wasm2js/emscripten-grow-yes.2asm.js +++ b/test/wasm2js/emscripten-grow-yes.2asm.js @@ -46,7 +46,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; // EMSCRIPTEN_START_FUNCS diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js.opt b/test/wasm2js/emscripten-grow-yes.2asm.js.opt index 4167e7741..68a8c556c 100644 --- a/test/wasm2js/emscripten-grow-yes.2asm.js.opt +++ b/test/wasm2js/emscripten-grow-yes.2asm.js.opt @@ -46,7 +46,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; // EMSCRIPTEN_START_FUNCS diff --git a/test/wasm2js/emscripten.2asm.js b/test/wasm2js/emscripten.2asm.js index 5a574a3b3..5156c63a6 100644 --- a/test/wasm2js/emscripten.2asm.js +++ b/test/wasm2js/emscripten.2asm.js @@ -24,6 +24,8 @@ function initActiveSegments(imports) { base64DecodeToExistingUint8Array(bufferView, 1024, "aGVsbG8sIHdvcmxkIQoAAJwMAAAtKyAgIDBYMHgAKG51bGwpAAAAAAAAAAAAAAAAEQAKABEREQAAAAAFAAAAAAAACQAAAAALAAAAAAAAAAARAA8KERERAwoHAAETCQsLAAAJBgsAAAsABhEAAAAREREAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAEQAKChEREQAKAAACAAkLAAAACQALAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAwAAAAADAAAAAAJDAAAAAAADAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAANAAAABA0AAAAACQ4AAAAAAA4AAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAADwAAAAAPAAAAAAkQAAAAAAAQAAAQAAASAAAAEhISAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAAAASEhIAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAAAAAAAAAKAAAAAAoAAAAACQsAAAAAAAsAAAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAADAAAAAAMAAAAAAkMAAAAAAAMAAAMAAAwMTIzNDU2Nzg5QUJDREVGLTBYKzBYIDBYLTB4KzB4IDB4AGluZgBJTkYAbmFuAE5BTgAuAA=="); base64DecodeToExistingUint8Array(bufferView, 1600, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="); } +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); @@ -46,7 +48,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var syscall$6 = env.__syscall6; @@ -67,7 +68,7 @@ function asmFunc(importObject) { } function foo() { - abort(); + wasm2js_trap(); } function bar() { @@ -162,7 +163,7 @@ function asmFunc(importObject) { function __growWasmMemory($0) { $0 = $0 | 0; - return abort() | 0; + return wasm2js_trap() | 0; } function internal(x) { @@ -207,7 +208,7 @@ function asmFunc(importObject) { bools(2 | 0) | 0 } bools(!(x ^ 1 | 0) | 0) | 0; - abort(); + wasm2js_trap(); } // EMSCRIPTEN_END_FUNCS diff --git a/test/wasm2js/emscripten.2asm.js.opt b/test/wasm2js/emscripten.2asm.js.opt index 88fe0866a..a9217f159 100644 --- a/test/wasm2js/emscripten.2asm.js.opt +++ b/test/wasm2js/emscripten.2asm.js.opt @@ -36,6 +36,8 @@ function initActiveSegments(imports) { base64DecodeToExistingUint8Array(bufferView, 1501, "DA=="); base64DecodeToExistingUint8Array(bufferView, 1513, "DAAAAAAMAAAAAAkMAAAAAAAMAAAMAAAwMTIzNDU2Nzg5QUJDREVGLTBYKzBYIDBYLTB4KzB4IDB4AGluZgBJTkYAbmFuAE5BTgAu"); } +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); @@ -58,7 +60,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var syscall$6 = env.__syscall6; @@ -76,7 +77,7 @@ function asmFunc(importObject) { } function foo() { - abort(); + wasm2js_trap(); } function bar() { @@ -167,7 +168,7 @@ function asmFunc(importObject) { function __growWasmMemory($0) { $0 = $0 | 0; - return abort() | 0; + return wasm2js_trap() | 0; } function internal($0) { @@ -202,7 +203,7 @@ function asmFunc(importObject) { bools(2) } bools(!($0 ^ 1)); - abort(); + wasm2js_trap(); } // EMSCRIPTEN_END_FUNCS diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js index 380121f9b..e87d6ed5e 100644 --- a/test/wasm2js/endianness.2asm.js +++ b/test/wasm2js/endianness.2asm.js @@ -52,7 +52,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -701,9 +700,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_load16_s = retasmFunc.i32_load16_s; export var i32_load16_u = retasmFunc.i32_load16_u; export var i32_load = retasmFunc.i32_load; diff --git a/test/wasm2js/excess_fallthrough.2asm.js b/test/wasm2js/excess_fallthrough.2asm.js index 378a50df3..2327fba9b 100644 --- a/test/wasm2js/excess_fallthrough.2asm.js +++ b/test/wasm2js/excess_fallthrough.2asm.js @@ -1,4 +1,6 @@ +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var Math_imul = Math.imul; @@ -11,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function bar() { @@ -34,7 +35,7 @@ function asmFunc(importObject) { bar(); return; } - abort(); + wasm2js_trap(); }; } @@ -43,6 +44,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/excess_fallthrough.2asm.js.opt b/test/wasm2js/excess_fallthrough.2asm.js.opt index cebc82e03..de165ddf5 100644 --- a/test/wasm2js/excess_fallthrough.2asm.js.opt +++ b/test/wasm2js/excess_fallthrough.2asm.js.opt @@ -1,4 +1,6 @@ +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var Math_imul = Math.imul; @@ -11,12 +13,11 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo($0) { $0 = $0 | 0; - abort(); + wasm2js_trap(); } return { @@ -24,6 +25,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/export_global.2asm.js b/test/wasm2js/export_global.2asm.js index 1ebd971d1..fa1b49774 100644 --- a/test/wasm2js/export_global.2asm.js +++ b/test/wasm2js/export_global.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var global0 = 655360; @@ -32,7 +31,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var HELLO = retasmFunc.HELLO; export var helloWorld = retasmFunc.helloWorld; diff --git a/test/wasm2js/export_global.2asm.js.opt b/test/wasm2js/export_global.2asm.js.opt index a79005c55..9352d898b 100644 --- a/test/wasm2js/export_global.2asm.js.opt +++ b/test/wasm2js/export_global.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var global0 = 655360; @@ -32,7 +31,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var HELLO = retasmFunc.HELLO; export var helloWorld = retasmFunc.helloWorld; diff --git a/test/wasm2js/f32.2asm.js b/test/wasm2js/f32.2asm.js index 61943bbdf..904fd1586 100644 --- a/test/wasm2js/f32.2asm.js +++ b/test/wasm2js/f32.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -106,8 +105,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var add = retasmFunc.add; export var sub = retasmFunc.sub; export var mul = retasmFunc.mul; diff --git a/test/wasm2js/f32_cmp.2asm.js b/test/wasm2js/f32_cmp.2asm.js index edb07308f..80766d46d 100644 --- a/test/wasm2js/f32_cmp.2asm.js +++ b/test/wasm2js/f32_cmp.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -60,8 +59,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var eq = retasmFunc.eq; export var ne = retasmFunc.ne; export var lt = retasmFunc.lt; diff --git a/test/wasm2js/f64_cmp.2asm.js b/test/wasm2js/f64_cmp.2asm.js index 8ea8e3d1c..da2676499 100644 --- a/test/wasm2js/f64_cmp.2asm.js +++ b/test/wasm2js/f64_cmp.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -60,8 +59,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var eq = retasmFunc.eq; export var ne = retasmFunc.ne; export var lt = retasmFunc.lt; diff --git a/test/wasm2js/fac.2asm.js b/test/wasm2js/fac.2asm.js index d911c421b..087e7635d 100644 --- a/test/wasm2js/fac.2asm.js +++ b/test/wasm2js/fac.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -575,9 +574,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var fac_rec = retasmFunc.fac_rec; export var fac_rec_named = retasmFunc.fac_rec_named; export var fac_iter = retasmFunc.fac_iter; diff --git a/test/wasm2js/float-ops.2asm.js b/test/wasm2js/float-ops.2asm.js index 9fe0fbad4..22c838398 100644 --- a/test/wasm2js/float-ops.2asm.js +++ b/test/wasm2js/float-ops.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, $1_1) { @@ -506,8 +505,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul; diff --git a/test/wasm2js/float-ops.2asm.js.opt b/test/wasm2js/float-ops.2asm.js.opt index d9ba62568..3a04777f3 100644 --- a/test/wasm2js/float-ops.2asm.js.opt +++ b/test/wasm2js/float-ops.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, $1_1) { @@ -316,8 +315,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul; diff --git a/test/wasm2js/float_literals-modified.2asm.js b/test/wasm2js/float_literals-modified.2asm.js index f0bf16baf..d354f6817 100644 --- a/test/wasm2js/float_literals-modified.2asm.js +++ b/test/wasm2js/float_literals-modified.2asm.js @@ -30,7 +30,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -1149,9 +1148,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var f32_nan = retasmFunc.f32_nan; export var f32_positive_nan = retasmFunc.f32_positive_nan; export var f32_negative_nan = retasmFunc.f32_negative_nan; diff --git a/test/wasm2js/float_literals-modified.2asm.js.opt b/test/wasm2js/float_literals-modified.2asm.js.opt index 03587e00e..96f68b803 100644 --- a/test/wasm2js/float_literals-modified.2asm.js.opt +++ b/test/wasm2js/float_literals-modified.2asm.js.opt @@ -26,7 +26,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -365,9 +364,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var f32_nan = retasmFunc.f32_nan; export var f32_positive_nan = retasmFunc.f32_positive_nan; export var f32_negative_nan = retasmFunc.f32_negative_nan; diff --git a/test/wasm2js/float_misc.2asm.js b/test/wasm2js/float_misc.2asm.js index ab29ed020..86f4c1124 100644 --- a/test/wasm2js/float_misc.2asm.js +++ b/test/wasm2js/float_misc.2asm.js @@ -41,7 +41,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -286,8 +285,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul; diff --git a/test/wasm2js/forward.2asm.js b/test/wasm2js/forward.2asm.js index 95203a423..15b7425e9 100644 --- a/test/wasm2js/forward.2asm.js +++ b/test/wasm2js/forward.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function even(n) { @@ -42,7 +41,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var even = retasmFunc.even; export var odd = retasmFunc.odd; diff --git a/test/wasm2js/func-ptr-offset.2asm.js b/test/wasm2js/func-ptr-offset.2asm.js index 3f3e2b028..f612ea71b 100644 --- a/test/wasm2js/func-ptr-offset.2asm.js +++ b/test/wasm2js/func-ptr-offset.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function t1() { @@ -37,6 +36,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var call = retasmFunc.call; diff --git a/test/wasm2js/func-ptr-offset.2asm.js.opt b/test/wasm2js/func-ptr-offset.2asm.js.opt index 806989efa..4b51ebfcc 100644 --- a/test/wasm2js/func-ptr-offset.2asm.js.opt +++ b/test/wasm2js/func-ptr-offset.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function t1() { @@ -37,6 +36,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var call = retasmFunc.call; diff --git a/test/wasm2js/func_ptrs.2asm.js b/test/wasm2js/func_ptrs.2asm.js index 0adb50fdb..f98102a03 100644 --- a/test/wasm2js/func_ptrs.2asm.js +++ b/test/wasm2js/func_ptrs.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var print = env.print_i32; @@ -43,9 +42,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - print_i32 - }); +var retasmFunc = asmFunc({ + print_i32, +}); export var one = retasmFunc.one; export var two = retasmFunc.two; export var three = retasmFunc.three; @@ -63,7 +62,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function t1() { @@ -103,8 +101,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var callt = retasmFunc.callt; export var callu = retasmFunc.callu; @@ -120,7 +118,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function t1() { @@ -142,6 +139,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var callt = retasmFunc.callt; diff --git a/test/wasm2js/get-set-local.2asm.js b/test/wasm2js/get-set-local.2asm.js index 315b5143e..0c9ab3fa4 100644 --- a/test/wasm2js/get-set-local.2asm.js +++ b/test/wasm2js/get-set-local.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, r, r$hi) { @@ -62,6 +61,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var check_extend_ui32 = retasmFunc.check_extend_ui32; diff --git a/test/wasm2js/get-set-local.2asm.js.opt b/test/wasm2js/get-set-local.2asm.js.opt index c457a4b90..fb0520b91 100644 --- a/test/wasm2js/get-set-local.2asm.js.opt +++ b/test/wasm2js/get-set-local.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function legalstub$1($0, $1, $2) { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var check_extend_ui32 = retasmFunc.check_extend_ui32; diff --git a/test/wasm2js/get_local.2asm.js b/test/wasm2js/get_local.2asm.js index bdc8a6c72..d719e5f4b 100644 --- a/test/wasm2js/get_local.2asm.js +++ b/test/wasm2js/get_local.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -242,9 +241,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64; export var type_local_f32 = retasmFunc.type_local_f32; diff --git a/test/wasm2js/global_i64.2asm.js b/test/wasm2js/global_i64.2asm.js index 6c6f7cc94..77436ccae 100644 --- a/test/wasm2js/global_i64.2asm.js +++ b/test/wasm2js/global_i64.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var f = -1412567121; @@ -35,6 +34,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var exp = retasmFunc.exp; diff --git a/test/wasm2js/global_i64.2asm.js.opt b/test/wasm2js/global_i64.2asm.js.opt index 2ae651690..619a4a1f0 100644 --- a/test/wasm2js/global_i64.2asm.js.opt +++ b/test/wasm2js/global_i64.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1() { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var exp = retasmFunc.exp; diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js index e3acd45e6..0cb4aa818 100644 --- a/test/wasm2js/grow-memory-tricky.2asm.js +++ b/test/wasm2js/grow-memory-tricky.2asm.js @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -81,8 +80,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var memory = retasmFunc.memory; export var f1 = retasmFunc.f1; export var f2 = retasmFunc.f2; diff --git a/test/wasm2js/grow-memory-tricky.2asm.js.opt b/test/wasm2js/grow-memory-tricky.2asm.js.opt index 1b64e1530..e134fb9fa 100644 --- a/test/wasm2js/grow-memory-tricky.2asm.js.opt +++ b/test/wasm2js/grow-memory-tricky.2asm.js.opt @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -71,8 +70,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var memory = retasmFunc.memory; export var f1 = retasmFunc.f1; export var f2 = retasmFunc.f2; diff --git a/test/wasm2js/grow_memory.2asm.js b/test/wasm2js/grow_memory.2asm.js index 6b5c663fc..413a31728 100644 --- a/test/wasm2js/grow_memory.2asm.js +++ b/test/wasm2js/grow_memory.2asm.js @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(var$0) { @@ -74,8 +73,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var memory = retasmFunc.memory; export var grow = retasmFunc.grow; export var current = retasmFunc.current; diff --git a/test/wasm2js/i32.2asm.js b/test/wasm2js/i32.2asm.js index 893fe7474..c9b3e319e 100644 --- a/test/wasm2js/i32.2asm.js +++ b/test/wasm2js/i32.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -260,8 +259,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var add = retasmFunc.add; export var sub = retasmFunc.sub; export var mul = retasmFunc.mul; diff --git a/test/wasm2js/i64-add-sub.2asm.js b/test/wasm2js/i64-add-sub.2asm.js index a9cc11036..4dfbc10c8 100644 --- a/test/wasm2js/i64-add-sub.2asm.js +++ b/test/wasm2js/i64-add-sub.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, $0$hi, $1_1, $1$hi, r, r$hi) { @@ -231,7 +230,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var check_add_i64 = retasmFunc.check_add_i64; export var check_sub_i64 = retasmFunc.check_sub_i64; diff --git a/test/wasm2js/i64-add-sub.2asm.js.opt b/test/wasm2js/i64-add-sub.2asm.js.opt index 6c992b4b4..2bf310f02 100644 --- a/test/wasm2js/i64-add-sub.2asm.js.opt +++ b/test/wasm2js/i64-add-sub.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function legalstub$1($0, $1, $2, $3, $4, $5) { @@ -31,7 +30,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var check_add_i64 = retasmFunc.check_add_i64; export var check_sub_i64 = retasmFunc.check_sub_i64; diff --git a/test/wasm2js/i64-ctz.2asm.js b/test/wasm2js/i64-ctz.2asm.js index 77fc303dc..2a12ea0eb 100644 --- a/test/wasm2js/i64-ctz.2asm.js +++ b/test/wasm2js/i64-ctz.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -234,8 +233,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var a = retasmFunc.a; export var b = retasmFunc.b; diff --git a/test/wasm2js/i64-ctz.2asm.js.opt b/test/wasm2js/i64-ctz.2asm.js.opt index 92a271b76..a20760aac 100644 --- a/test/wasm2js/i64-ctz.2asm.js.opt +++ b/test/wasm2js/i64-ctz.2asm.js.opt @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -66,8 +65,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var a = retasmFunc.a; export var b = retasmFunc.b; diff --git a/test/wasm2js/i64-lowering.2asm.js b/test/wasm2js/i64-lowering.2asm.js index 300ce0766..06ac51abb 100644 --- a/test/wasm2js/i64-lowering.2asm.js +++ b/test/wasm2js/i64-lowering.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, $0$hi, $1_1, $1$hi) { @@ -790,8 +789,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var eq_i64 = retasmFunc.eq_i64; export var ne_i64 = retasmFunc.ne_i64; export var ge_s_i64 = retasmFunc.ge_s_i64; diff --git a/test/wasm2js/i64-lowering.2asm.js.opt b/test/wasm2js/i64-lowering.2asm.js.opt index e79c1571c..829e26082 100644 --- a/test/wasm2js/i64-lowering.2asm.js.opt +++ b/test/wasm2js/i64-lowering.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function legalstub$1($0, $1, $2, $3) { @@ -68,8 +67,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var eq_i64 = retasmFunc.eq_i64; export var ne_i64 = retasmFunc.ne_i64; export var ge_s_i64 = retasmFunc.ge_s_i64; diff --git a/test/wasm2js/i64-rotate.2asm.js b/test/wasm2js/i64-rotate.2asm.js index 749c2d0b4..6b23a464c 100644 --- a/test/wasm2js/i64-rotate.2asm.js +++ b/test/wasm2js/i64-rotate.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var i64toi32_i32$HIGH_BITS = 0; @@ -443,7 +442,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var rotl = retasmFunc.rotl; export var rotr = retasmFunc.rotr; diff --git a/test/wasm2js/i64-rotate.2asm.js.opt b/test/wasm2js/i64-rotate.2asm.js.opt index 83232748d..5a5725f1b 100644 --- a/test/wasm2js/i64-rotate.2asm.js.opt +++ b/test/wasm2js/i64-rotate.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var i64toi32_i32$HIGH_BITS = 0; @@ -117,7 +116,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var rotl = retasmFunc.rotl; export var rotr = retasmFunc.rotr; diff --git a/test/wasm2js/i64-select.2asm.js b/test/wasm2js/i64-select.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/i64-select.2asm.js +++ b/test/wasm2js/i64-select.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/i64-select.2asm.js.opt b/test/wasm2js/i64-select.2asm.js.opt index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/i64-select.2asm.js.opt +++ b/test/wasm2js/i64-select.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/i64-shifts.2asm.js b/test/wasm2js/i64-shifts.2asm.js index 669412062..0e8c005ac 100644 --- a/test/wasm2js/i64-shifts.2asm.js +++ b/test/wasm2js/i64-shifts.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0, $0$hi, $1_1, $1$hi, $2_1, $2$hi) { @@ -248,7 +247,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var shl_i64 = retasmFunc.shl_i64; export var shr_i64 = retasmFunc.shr_i64; diff --git a/test/wasm2js/i64-shifts.2asm.js.opt b/test/wasm2js/i64-shifts.2asm.js.opt index 3914b5095..336aef645 100644 --- a/test/wasm2js/i64-shifts.2asm.js.opt +++ b/test/wasm2js/i64-shifts.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function legalstub$1($0, $1, $2, $3, $4, $5) { @@ -46,7 +45,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var shl_i64 = retasmFunc.shl_i64; export var shr_i64 = retasmFunc.shr_i64; diff --git a/test/wasm2js/if_unreachable.2asm.js b/test/wasm2js/if_unreachable.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/if_unreachable.2asm.js +++ b/test/wasm2js/if_unreachable.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/if_unreachable.2asm.js.opt b/test/wasm2js/if_unreachable.2asm.js.opt index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/if_unreachable.2asm.js.opt +++ b/test/wasm2js/if_unreachable.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/indirect-select.2asm.js b/test/wasm2js/indirect-select.2asm.js index 1f279dbc5..c79b0ae49 100644 --- a/test/wasm2js/indirect-select.2asm.js +++ b/test/wasm2js/indirect-select.2asm.js @@ -13,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x) { @@ -32,8 +31,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - table - }); +var retasmFunc = asmFunc({ + table, +}); export var foo_true = retasmFunc.foo_true; export var foo_false = retasmFunc.foo_false; diff --git a/test/wasm2js/indirect-select.2asm.js.opt b/test/wasm2js/indirect-select.2asm.js.opt index 5389157f8..71cf64269 100644 --- a/test/wasm2js/indirect-select.2asm.js.opt +++ b/test/wasm2js/indirect-select.2asm.js.opt @@ -13,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0($0_1) { @@ -32,8 +31,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - table - }); +var retasmFunc = asmFunc({ + table, +}); export var foo_true = retasmFunc.foo_true; export var foo_false = retasmFunc.foo_false; diff --git a/test/wasm2js/int_exprs.2asm.js b/test/wasm2js/int_exprs.2asm.js index 2887fec6d..3d5c27638 100644 --- a/test/wasm2js/int_exprs.2asm.js +++ b/test/wasm2js/int_exprs.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x, y) { @@ -231,8 +230,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_no_fold_cmp_s_offset = retasmFunc.i32_no_fold_cmp_s_offset; export var i32_no_fold_cmp_u_offset = retasmFunc.i32_no_fold_cmp_u_offset; export var i64_no_fold_cmp_s_offset = retasmFunc.i64_no_fold_cmp_s_offset; @@ -251,7 +250,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -317,9 +315,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i64_no_fold_wrap_extend_s = retasmFunc.i64_no_fold_wrap_extend_s; import { setTempRet0 } from 'env'; @@ -335,7 +333,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -400,9 +397,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i64_no_fold_wrap_extend_u = retasmFunc.i64_no_fold_wrap_extend_u; import { setTempRet0 } from 'env'; @@ -418,7 +415,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -595,9 +591,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_shl_shr_s = retasmFunc.i32_no_fold_shl_shr_s; export var i32_no_fold_shl_shr_u = retasmFunc.i32_no_fold_shl_shr_u; export var i64_no_fold_shl_shr_s = retasmFunc.i64_no_fold_shl_shr_s; @@ -616,7 +612,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -793,9 +788,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_shr_s_shl = retasmFunc.i32_no_fold_shr_s_shl; export var i32_no_fold_shr_u_shl = retasmFunc.i32_no_fold_shr_u_shl; export var i64_no_fold_shr_s_shl = retasmFunc.i64_no_fold_shr_s_shl; @@ -814,7 +809,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -1606,9 +1600,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_div_s_mul = retasmFunc.i32_no_fold_div_s_mul; export var i32_no_fold_div_u_mul = retasmFunc.i32_no_fold_div_u_mul; export var i64_no_fold_div_s_mul = retasmFunc.i64_no_fold_div_s_mul; @@ -1627,7 +1621,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -2325,9 +2318,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_div_s_self = retasmFunc.i32_no_fold_div_s_self; export var i32_no_fold_div_u_self = retasmFunc.i32_no_fold_div_u_self; export var i64_no_fold_div_s_self = retasmFunc.i64_no_fold_div_s_self; @@ -2346,7 +2339,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -3026,9 +3018,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_rem_s_self = retasmFunc.i32_no_fold_rem_s_self; export var i32_no_fold_rem_u_self = retasmFunc.i32_no_fold_rem_u_self; export var i64_no_fold_rem_s_self = retasmFunc.i64_no_fold_rem_s_self; @@ -3047,7 +3039,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -3839,9 +3830,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_mul_div_s = retasmFunc.i32_no_fold_mul_div_s; export var i32_no_fold_mul_div_u = retasmFunc.i32_no_fold_mul_div_u; export var i64_no_fold_mul_div_s = retasmFunc.i64_no_fold_mul_div_s; @@ -3860,7 +3851,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -4494,9 +4484,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_div_s_2 = retasmFunc.i32_no_fold_div_s_2; export var i64_no_fold_div_s_2 = retasmFunc.i64_no_fold_div_s_2; import { setTempRet0 } from 'env'; @@ -4513,7 +4503,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -5129,9 +5118,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_rem_s_2 = retasmFunc.i32_no_fold_rem_s_2; export var i64_no_fold_rem_s_2 = retasmFunc.i64_no_fold_rem_s_2; import { setTempRet0 } from 'env'; @@ -5148,7 +5137,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -5846,9 +5834,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_div_s_0 = retasmFunc.i32_div_s_0; export var i32_div_u_0 = retasmFunc.i32_div_u_0; export var i64_div_s_0 = retasmFunc.i64_div_s_0; @@ -5867,7 +5855,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -6565,9 +6552,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_div_s_3 = retasmFunc.i32_div_s_3; export var i32_div_u_3 = retasmFunc.i32_div_u_3; export var i64_div_s_3 = retasmFunc.i64_div_s_3; @@ -6586,7 +6573,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -7284,9 +7270,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_div_s_5 = retasmFunc.i32_div_s_5; export var i32_div_u_5 = retasmFunc.i32_div_u_5; export var i64_div_s_5 = retasmFunc.i64_div_s_5; @@ -7305,7 +7291,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -8003,9 +7988,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_div_s_7 = retasmFunc.i32_div_s_7; export var i32_div_u_7 = retasmFunc.i32_div_u_7; export var i64_div_s_7 = retasmFunc.i64_div_s_7; @@ -8024,7 +8009,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -8704,9 +8688,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_rem_s_3 = retasmFunc.i32_rem_s_3; export var i32_rem_u_3 = retasmFunc.i32_rem_u_3; export var i64_rem_s_3 = retasmFunc.i64_rem_s_3; @@ -8725,7 +8709,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -9405,9 +9388,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_rem_s_5 = retasmFunc.i32_rem_s_5; export var i32_rem_u_5 = retasmFunc.i32_rem_u_5; export var i64_rem_s_5 = retasmFunc.i64_rem_s_5; @@ -9426,7 +9409,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -10106,9 +10088,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_rem_s_7 = retasmFunc.i32_rem_s_7; export var i32_rem_u_7 = retasmFunc.i32_rem_u_7; export var i64_rem_s_7 = retasmFunc.i64_rem_s_7; @@ -10127,7 +10109,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -10761,8 +10742,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_no_fold_div_neg1 = retasmFunc.i32_no_fold_div_neg1; export var i64_no_fold_div_neg1 = retasmFunc.i64_no_fold_div_neg1; diff --git a/test/wasm2js/labels.2asm.js b/test/wasm2js/labels.2asm.js index 8026a56c7..5a7699514 100644 --- a/test/wasm2js/labels.2asm.js +++ b/test/wasm2js/labels.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -339,8 +338,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var block = retasmFunc.block; export var loop1 = retasmFunc.loop1; export var loop2 = retasmFunc.loop2; diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js index 491c8c39a..68524fb75 100644 --- a/test/wasm2js/left-to-right.2asm.js +++ b/test/wasm2js/left-to-right.2asm.js @@ -47,7 +47,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var __wasm_intrinsics_temp_i64 = 0; @@ -2164,8 +2163,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_add = retasmFunc.i32_add; export var i32_sub = retasmFunc.i32_sub; export var i32_mul = retasmFunc.i32_mul; diff --git a/test/wasm2js/minified-memory.2asm.js b/test/wasm2js/minified-memory.2asm.js index f8643a54d..defabfcab 100644 --- a/test/wasm2js/minified-memory.2asm.js +++ b/test/wasm2js/minified-memory.2asm.js @@ -22,7 +22,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -61,7 +60,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(65536); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ a: { buffer : memasmFunc } - }); +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/minified-memory.2asm.js.opt b/test/wasm2js/minified-memory.2asm.js.opt index 298e015df..701f1d40a 100644 --- a/test/wasm2js/minified-memory.2asm.js.opt +++ b/test/wasm2js/minified-memory.2asm.js.opt @@ -22,7 +22,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -61,7 +60,7 @@ function asmFunc(importObject) { } var memasmFunc = new ArrayBuffer(65536); -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, +var retasmFunc = asmFunc({ a: { buffer : memasmFunc } - }); +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/minus_minus.2asm.js b/test/wasm2js/minus_minus.2asm.js index 1e09c55ef..46f0ee763 100644 --- a/test/wasm2js/minus_minus.2asm.js +++ b/test/wasm2js/minus_minus.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -27,6 +26,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var func_44_invoker = retasmFunc.func_44_invoker; diff --git a/test/wasm2js/minus_minus.2asm.js.opt b/test/wasm2js/minus_minus.2asm.js.opt index d3b1b08f9..095615602 100644 --- a/test/wasm2js/minus_minus.2asm.js.opt +++ b/test/wasm2js/minus_minus.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1() { @@ -23,6 +22,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var func_44_invoker = retasmFunc.func_44_invoker; diff --git a/test/wasm2js/nested-selects.2asm.js b/test/wasm2js/nested-selects.2asm.js index a6396c2b1..64bfa1eaf 100644 --- a/test/wasm2js/nested-selects.2asm.js +++ b/test/wasm2js/nested-selects.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0) { @@ -24,6 +23,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var sign = retasmFunc.sign; diff --git a/test/wasm2js/nested-selects.2asm.js.opt b/test/wasm2js/nested-selects.2asm.js.opt index c2d980fd1..4c453ec06 100644 --- a/test/wasm2js/nested-selects.2asm.js.opt +++ b/test/wasm2js/nested-selects.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0) { @@ -24,6 +23,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var sign = retasmFunc.sign; diff --git a/test/wasm2js/ordering.2asm.js b/test/wasm2js/ordering.2asm.js index 832ff0d60..99794e58a 100644 --- a/test/wasm2js/ordering.2asm.js +++ b/test/wasm2js/ordering.2asm.js @@ -13,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function main() { @@ -55,7 +54,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - table - }); +var retasmFunc = asmFunc({ + table, +}); export var main = retasmFunc.main; diff --git a/test/wasm2js/ordering.2asm.js.opt b/test/wasm2js/ordering.2asm.js.opt index d25472282..ff459dd39 100644 --- a/test/wasm2js/ordering.2asm.js.opt +++ b/test/wasm2js/ordering.2asm.js.opt @@ -13,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function main() { @@ -46,7 +45,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - table - }); +var retasmFunc = asmFunc({ + table, +}); export var main = retasmFunc.main; diff --git a/test/wasm2js/reinterpret.2asm.js b/test/wasm2js/reinterpret.2asm.js index 84cde1611..5082c3839 100644 --- a/test/wasm2js/reinterpret.2asm.js +++ b/test/wasm2js/reinterpret.2asm.js @@ -41,7 +41,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0) { @@ -98,7 +97,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_roundtrip = retasmFunc.i32_roundtrip; export var i64_roundtrip = retasmFunc.i64_roundtrip; diff --git a/test/wasm2js/reinterpret.2asm.js.opt b/test/wasm2js/reinterpret.2asm.js.opt index 0fff7b749..7b9b87c3b 100644 --- a/test/wasm2js/reinterpret.2asm.js.opt +++ b/test/wasm2js/reinterpret.2asm.js.opt @@ -33,7 +33,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $1($0) { @@ -56,7 +55,7 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_roundtrip = retasmFunc.i32_roundtrip; export var i64_roundtrip = retasmFunc.i64_roundtrip; diff --git a/test/wasm2js/reinterpret_scratch.2asm.js b/test/wasm2js/reinterpret_scratch.2asm.js index 3374c0221..c36595d33 100644 --- a/test/wasm2js/reinterpret_scratch.2asm.js +++ b/test/wasm2js/reinterpret_scratch.2asm.js @@ -39,7 +39,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -62,6 +61,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/reinterpret_scratch.2asm.js.opt b/test/wasm2js/reinterpret_scratch.2asm.js.opt index 2841115c0..caf289186 100644 --- a/test/wasm2js/reinterpret_scratch.2asm.js.opt +++ b/test/wasm2js/reinterpret_scratch.2asm.js.opt @@ -35,7 +35,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0() { @@ -57,6 +56,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var foo = retasmFunc.foo; diff --git a/test/wasm2js/set_local.2asm.js b/test/wasm2js/set_local.2asm.js index bbbe10057..df8226995 100644 --- a/test/wasm2js/set_local.2asm.js +++ b/test/wasm2js/set_local.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -221,9 +220,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64; export var type_local_f32 = retasmFunc.type_local_f32; diff --git a/test/wasm2js/sign_ext.2asm.js b/test/wasm2js/sign_ext.2asm.js index eb8489991..1900cfeff 100644 --- a/test/wasm2js/sign_ext.2asm.js +++ b/test/wasm2js/sign_ext.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -201,9 +200,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var test8 = retasmFunc.test8; export var test16 = retasmFunc.test16; export var test8_i64 = retasmFunc.test8_i64; diff --git a/test/wasm2js/sign_ext.2asm.js.opt b/test/wasm2js/sign_ext.2asm.js.opt index deb83da63..1ba32e2dd 100644 --- a/test/wasm2js/sign_ext.2asm.js.opt +++ b/test/wasm2js/sign_ext.2asm.js.opt @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -56,9 +55,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var test8 = retasmFunc.test8; export var test16 = retasmFunc.test16; export var test8_i64 = retasmFunc.test8_i64; diff --git a/test/wasm2js/stack-modified.2asm.js b/test/wasm2js/stack-modified.2asm.js index c77555e3b..66423631a 100644 --- a/test/wasm2js/stack-modified.2asm.js +++ b/test/wasm2js/stack-modified.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -564,9 +563,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var fac_expr = retasmFunc.fac_expr; export var fac_stack = retasmFunc.fac_stack; export var fac_stack_raw = retasmFunc.fac_stack_raw; diff --git a/test/wasm2js/stack-modified.2asm.js.opt b/test/wasm2js/stack-modified.2asm.js.opt index 022279d36..239dc6d98 100644 --- a/test/wasm2js/stack-modified.2asm.js.opt +++ b/test/wasm2js/stack-modified.2asm.js.opt @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -61,9 +60,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var fac_expr = retasmFunc.fac_expr; export var fac_stack = retasmFunc.fac_stack; export var fac_stack_raw = retasmFunc.fac_stack_raw; diff --git a/test/wasm2js/start_func.2asm.js b/test/wasm2js/start_func.2asm.js index c1e37ab70..a6b87a02f 100644 --- a/test/wasm2js/start_func.2asm.js +++ b/test/wasm2js/start_func.2asm.js @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo() { @@ -58,5 +57,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/start_func.2asm.js.opt b/test/wasm2js/start_func.2asm.js.opt index f7a43feff..957931a62 100644 --- a/test/wasm2js/start_func.2asm.js.opt +++ b/test/wasm2js/start_func.2asm.js.opt @@ -20,7 +20,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function foo() { @@ -58,5 +57,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/switch.2asm.js b/test/wasm2js/switch.2asm.js index 0afe9a33f..984d0e9a7 100644 --- a/test/wasm2js/switch.2asm.js +++ b/test/wasm2js/switch.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -184,9 +183,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var stmt = retasmFunc.stmt; export var expr = retasmFunc.expr; export var arg = retasmFunc.arg; diff --git a/test/wasm2js/tee_local.2asm.js b/test/wasm2js/tee_local.2asm.js index 0e94a2b6c..8bced1525 100644 --- a/test/wasm2js/tee_local.2asm.js +++ b/test/wasm2js/tee_local.2asm.js @@ -12,7 +12,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -328,9 +327,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64; export var type_local_f32 = retasmFunc.type_local_f32; diff --git a/test/wasm2js/traps.2asm.js b/test/wasm2js/traps.2asm.js index 920317cde..8ad162cfc 100644 --- a/test/wasm2js/traps.2asm.js +++ b/test/wasm2js/traps.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var __wasm_intrinsics_temp_i64 = 0; @@ -726,8 +725,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var no_dce_i32_div_s = retasmFunc.no_dce_i32_div_s; export var no_dce_i32_div_u = retasmFunc.no_dce_i32_div_u; export var no_dce_i64_div_s = retasmFunc.no_dce_i64_div_s; @@ -745,7 +744,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var __wasm_intrinsics_temp_i64 = 0; @@ -1442,8 +1440,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var no_dce_i32_rem_s = retasmFunc.no_dce_i32_rem_s; export var no_dce_i32_rem_u = retasmFunc.no_dce_i32_rem_u; export var no_dce_i64_rem_s = retasmFunc.no_dce_i64_rem_s; @@ -1461,7 +1459,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(x) { @@ -1564,8 +1561,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var no_dce_i32_trunc_f32_s = retasmFunc.no_dce_i32_trunc_f32_s; export var no_dce_i32_trunc_f32_u = retasmFunc.no_dce_i32_trunc_f32_u; export var no_dce_i32_trunc_f64_s = retasmFunc.no_dce_i32_trunc_f64_s; @@ -1596,7 +1593,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; function $0(i) { @@ -1718,8 +1714,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var no_dce_i32_load = retasmFunc.no_dce_i32_load; export var no_dce_i32_load16_s = retasmFunc.no_dce_i32_load16_s; export var no_dce_i32_load16_u = retasmFunc.no_dce_i32_load16_u; diff --git a/test/wasm2js/unaligned.2asm.js b/test/wasm2js/unaligned.2asm.js index aea6e8fbd..4f3ffe8bd 100644 --- a/test/wasm2js/unaligned.2asm.js +++ b/test/wasm2js/unaligned.2asm.js @@ -52,7 +52,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -178,9 +177,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_load = retasmFunc.i32_load; export var i64_load = retasmFunc.i64_load; export var f32_load = retasmFunc.f32_load; diff --git a/test/wasm2js/unaligned.2asm.js.opt b/test/wasm2js/unaligned.2asm.js.opt index 8c61d3cbd..3178bb364 100644 --- a/test/wasm2js/unaligned.2asm.js.opt +++ b/test/wasm2js/unaligned.2asm.js.opt @@ -48,7 +48,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var setTempRet0 = env.setTempRet0; @@ -127,9 +126,9 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); }, - setTempRet0 - }); +var retasmFunc = asmFunc({ + setTempRet0, +}); export var i32_load = retasmFunc.i32_load; export var i64_load = retasmFunc.i64_load; export var f32_load = retasmFunc.f32_load; diff --git a/test/wasm2js/unary-ops.2asm.js b/test/wasm2js/unary-ops.2asm.js index a6f305da1..f5b97ad1e 100644 --- a/test/wasm2js/unary-ops.2asm.js +++ b/test/wasm2js/unary-ops.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var i64toi32_i32$HIGH_BITS = 0; @@ -518,8 +517,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_popcnt = retasmFunc.i32_popcnt; export var check_popcnt_i64 = retasmFunc.check_popcnt_i64; export var check_extend_ui32 = retasmFunc.check_extend_ui32; diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt index 473beeb96..44c4c59c0 100644 --- a/test/wasm2js/unary-ops.2asm.js.opt +++ b/test/wasm2js/unary-ops.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var i64toi32_i32$HIGH_BITS = 0; @@ -115,8 +114,8 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var i32_popcnt = retasmFunc.i32_popcnt; export var check_popcnt_i64 = retasmFunc.check_popcnt_i64; export var check_extend_ui32 = retasmFunc.check_extend_ui32; diff --git a/test/wasm2js/unreachable-get-cycle.2asm.js b/test/wasm2js/unreachable-get-cycle.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/unreachable-get-cycle.2asm.js +++ b/test/wasm2js/unreachable-get-cycle.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/unreachable-get-cycle.2asm.js.opt b/test/wasm2js/unreachable-get-cycle.2asm.js.opt index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/unreachable-get-cycle.2asm.js.opt +++ b/test/wasm2js/unreachable-get-cycle.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/unreachable-insts.2asm.js b/test/wasm2js/unreachable-insts.2asm.js index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/unreachable-insts.2asm.js +++ b/test/wasm2js/unreachable-insts.2asm.js @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/unreachable-insts.2asm.js.opt b/test/wasm2js/unreachable-insts.2asm.js.opt index c605aa3d0..35bd685e8 100644 --- a/test/wasm2js/unreachable-insts.2asm.js.opt +++ b/test/wasm2js/unreachable-insts.2asm.js.opt @@ -11,7 +11,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; return { @@ -19,5 +18,5 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); diff --git a/test/wasm2js/unreachable-later.2asm.js b/test/wasm2js/unreachable-later.2asm.js index 73970d344..a8b05658d 100644 --- a/test/wasm2js/unreachable-later.2asm.js +++ b/test/wasm2js/unreachable-later.2asm.js @@ -1,4 +1,6 @@ +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var Math_imul = Math.imul; @@ -11,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var global$0 = 10; @@ -56,7 +57,7 @@ function asmFunc(importObject) { if (!$29) { return -255 | 0 } else { - abort() + wasm2js_trap() } } @@ -65,6 +66,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var func_50 = retasmFunc.func_50; diff --git a/test/wasm2js/unreachable-later.2asm.js.opt b/test/wasm2js/unreachable-later.2asm.js.opt index 03c208ff8..8adbd1efd 100644 --- a/test/wasm2js/unreachable-later.2asm.js.opt +++ b/test/wasm2js/unreachable-later.2asm.js.opt @@ -1,4 +1,6 @@ +function wasm2js_trap() { throw new Error('abort'); } + function asmFunc(importObject) { var env = importObject.env || importObject; var Math_imul = Math.imul; @@ -11,7 +13,6 @@ function asmFunc(importObject) { var Math_ceil = Math.ceil; var Math_trunc = Math.trunc; var Math_sqrt = Math.sqrt; - var abort = env.abort; var nan = NaN; var infinity = Infinity; var global$0 = 10; @@ -28,7 +29,7 @@ function asmFunc(importObject) { if (global$0) { break folding_inner0 } - abort(); + wasm2js_trap(); } return $0_1 | 0; } @@ -38,6 +39,6 @@ function asmFunc(importObject) { }; } -var retasmFunc = asmFunc( { abort: function() { throw new Error('abort'); } - }); +var retasmFunc = asmFunc({ +}); export var func_50 = retasmFunc.func_50; |