From d797c751df60aa5731a0cfaed1cc00811a5e273b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 16 Sep 2022 09:33:08 -0700
Subject: 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.
---
 test/wasm2js/excess_fallthrough.2asm.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test/wasm2js/excess_fallthrough.2asm.js')

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;
-- 
cgit v1.2.3