wasm2js: get rid of some non-flat code assumptions (#2036)

We run flatten there, which lets us simplify things a lot. Turns out that for assertions we didn't run it, which is why we still needed the old non-flat code paths. This adds flatten there and removes that old code and assumptions.

1 files changed, 6 insertions, 12 deletions

diff --git a/test/wasm2js/func_ptrs.2asm.js b/test/wasm2js/func_ptrs.2asm.js
index 9798a0622..09515b006 100644
--- a/test/wasm2js/func_ptrs.2asm.js
+++ b/test/wasm2js/func_ptrs.2asm.js
@@ -102,18 +102,14 @@ function asmFunc(global, env, buffer) {
  
  function $5(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  function $6(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2, t3, u1, u2, t1, t3];
@@ -160,10 +156,8 @@ function asmFunc(global, env, buffer) {
  
  function $2(i) {
   i = i | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$1 = i;
-  wasm2js_i32$0 = FUNCTION_TABLE[wasm2js_i32$1]() | 0;
-  return wasm2js_i32$0 | 0;
+  var wasm2js_i32$0 = 0;
+  return (wasm2js_i32$0 = i, FUNCTION_TABLE[wasm2js_i32$0]() | 0) | 0;
  }
  
  var FUNCTION_TABLE = [t1, t2];