wasm2js: Don't assume that `env.abort` can always be impored. (#5049)

This import was being injected and then used to implement trapping.
Rather than injecting an import that doesn't exist in the original
module we instead use the existing mechanism to implement this as
an internal helper.

1 files changed, 3 insertions, 4 deletions

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;