Remove f32 legalization from LegalizeJSInterface (#2052)

As well as i64 splitting this pass was also converting f32 to f64
at the wasm boundry.  However it appears this is not actually useful
and makes somethings (such as dynamic linking) harder.

20 files changed, 126 insertions, 530 deletions

diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js
index e8a1f3048..1939b05bd 100644
--- a/test/wasm2js/br.2asm.js
+++ b/test/wasm2js/br.2asm.js
@@ -577,10 +577,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$7() {
-  return +$7();
- }
- 
  function legalstub$23() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $23();
@@ -607,10 +603,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$39() {
-  return +$39();
- }
- 
  function legalstub$40() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $40();
@@ -637,10 +629,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$45() {
-  return +$45();
- }
- 
  function legalstub$47() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $47();
@@ -675,7 +663,7 @@ function asmFunc(global, env, buffer) {
   "type_f64": $4, 
   "type_i32_value": $5, 
   "type_i64_value": legalstub$6, 
-  "type_f32_value": legalstub$7, 
+  "type_f32_value": $7, 
   "type_f64_value": $8, 
   "as_block_first": $9, 
   "as_block_mid": $10, 
@@ -706,13 +694,13 @@ function asmFunc(global, env, buffer) {
   "as_call_indirect_mid": $36, 
   "as_call_indirect_last": $37, 
   "as_local_set_value": $38, 
-  "as_load_address": legalstub$39, 
+  "as_load_address": $39, 
   "as_loadN_address": legalstub$40, 
   "as_store_address": $41, 
   "as_store_value": $42, 
   "as_storeN_address": $43, 
   "as_storeN_value": $44, 
-  "as_unary_operand": legalstub$45, 
+  "as_unary_operand": $45, 
   "as_binary_left": $46, 
   "as_binary_right": legalstub$47, 
   "as_test_operand": $48, 
diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js
index 8587a25d4..18a67f343 100644
--- a/test/wasm2js/br_table.2asm.js
+++ b/test/wasm2js/br_table.2asm.js
@@ -50215,10 +50215,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$7() {
-  return +$7();
- }
- 
  function legalstub$30() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $30();
@@ -50245,10 +50241,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$46() {
-  return +$46();
- }
- 
  function legalstub$47() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $47();
@@ -50275,10 +50267,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$52() {
-  return +$52();
- }
- 
  function legalstub$54() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $54();
@@ -50313,7 +50301,7 @@ function asmFunc(global, env, buffer) {
   "type_f64": $4, 
   "type_i32_value": $5, 
   "type_i64_value": legalstub$6, 
-  "type_f32_value": legalstub$7, 
+  "type_f32_value": $7, 
   "type_f64_value": $8, 
   "empty": $9, 
   "empty_value": $10, 
@@ -50351,13 +50339,13 @@ function asmFunc(global, env, buffer) {
   "as_call_indirect_last": $43, 
   "as_call_indirect_func": $44, 
   "as_local_set_value": $45, 
-  "as_load_address": legalstub$46, 
+  "as_load_address": $46, 
   "as_loadN_address": legalstub$47, 
   "as_store_address": $48, 
   "as_store_value": $49, 
   "as_storeN_address": $50, 
   "as_storeN_value": $51, 
-  "as_unary_operand": legalstub$52, 
+  "as_unary_operand": $52, 
   "as_binary_left": $53, 
   "as_binary_right": legalstub$54, 
   "as_test_operand": $55, 
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js
index 106bef338..51cbc508e 100644
--- a/test/wasm2js/br_table_temp.2asm.js
+++ b/test/wasm2js/br_table_temp.2asm.js
@@ -50181,10 +50181,6 @@ function asmFunc(global, env, buffer) {
   return $3_1 | 0;
  }
  
- function legalstub$7() {
-  return +$7();
- }
- 
  var FUNCTION_TABLE = [];
  return {
   "type_i32": $1, 
@@ -50193,7 +50189,7 @@ function asmFunc(global, env, buffer) {
   "type_f64": $4, 
   "type_i32_value": $5, 
   "type_i64_value": $6, 
-  "type_f32_value": legalstub$7, 
+  "type_f32_value": $7, 
   "type_f64_value": $8, 
   "empty": $9, 
   "empty_value": $10, 
diff --git a/test/wasm2js/call.2asm.js b/test/wasm2js/call.2asm.js
index 44f54ca14..163e6f87d 100644
--- a/test/wasm2js/call.2asm.js
+++ b/test/wasm2js/call.2asm.js
@@ -357,10 +357,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$14() {
-  return +$14();
- }
- 
  function legalstub$17() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $17();
@@ -387,10 +383,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$18() {
-  return +$18();
- }
- 
  function legalstub$21() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $21();
@@ -417,10 +409,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$22() {
-  return +$22();
- }
- 
  function legalstub$fac($0, $1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
@@ -759,15 +747,15 @@ function asmFunc(global, env, buffer) {
  return {
   "type_i32": $12, 
   "type_i64": legalstub$13, 
-  "type_f32": legalstub$14, 
+  "type_f32": $14, 
   "type_f64": $15, 
   "type_first_i32": $16, 
   "type_first_i64": legalstub$17, 
-  "type_first_f32": legalstub$18, 
+  "type_first_f32": $18, 
   "type_first_f64": $19, 
   "type_second_i32": $20, 
   "type_second_i64": legalstub$21, 
-  "type_second_f32": legalstub$22, 
+  "type_second_f32": $22, 
   "type_second_f64": $23, 
   "fac": legalstub$fac, 
   "fac_acc": legalstub$fac_acc, 
diff --git a/test/wasm2js/call_indirect.2asm.js b/test/wasm2js/call_indirect.2asm.js
index ee581aeca..fbba86cef 100644
--- a/test/wasm2js/call_indirect.2asm.js
+++ b/test/wasm2js/call_indirect.2asm.js
@@ -379,10 +379,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$18() {
-  return +$18();
- }
- 
  function legalstub$20() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $20();
@@ -435,10 +431,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$23() {
-  return +$23();
- }
- 
  function legalstub$26() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $26();
@@ -465,10 +457,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$27() {
-  return +$27();
- }
- 
  function legalstub$29($0, $1, $2) {
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $14 = 0, $15 = 0, $4 = 0, $6 = 0, $6$hi = 0, $9$hi = 0, $3 = 0, $3$hi = 0;
   $4 = $0;
@@ -743,16 +731,16 @@ function asmFunc(global, env, buffer) {
  return {
   "type_i32": $16, 
   "type_i64": legalstub$17, 
-  "type_f32": legalstub$18, 
+  "type_f32": $18, 
   "type_f64": $19, 
   "type_index": legalstub$20, 
   "type_first_i32": $21, 
   "type_first_i64": legalstub$22, 
-  "type_first_f32": legalstub$23, 
+  "type_first_f32": $23, 
   "type_first_f64": $24, 
   "type_second_i32": $25, 
   "type_second_i64": legalstub$26, 
-  "type_second_f32": legalstub$27, 
+  "type_second_f32": $27, 
   "type_second_f64": $28, 
   "dispatch": legalstub$29, 
   "dispatch_structural": legalstub$30, 
diff --git a/test/wasm2js/conversions-modified.2asm.js b/test/wasm2js/conversions-modified.2asm.js
index bb8392de3..d866d9cdf 100644
--- a/test/wasm2js/conversions-modified.2asm.js
+++ b/test/wasm2js/conversions-modified.2asm.js
@@ -359,17 +359,9 @@ function asmFunc(global, env, buffer) {
   return $2(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$3($0_1) {
-  return $3(Math_fround($0_1));
- }
- 
- function legalstub$4($0_1) {
-  return $4(Math_fround($0_1));
- }
- 
  function legalstub$7($0_1) {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $8_1 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $7(Math_fround($0_1));
+  i64toi32_i32$0 = $7($0_1);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $1_1 = i64toi32_i32$0;
   $1$hi = i64toi32_i32$1;
@@ -395,7 +387,7 @@ function asmFunc(global, env, buffer) {
  
  function legalstub$8($0_1) {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $8_1 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $8(Math_fround($0_1));
+  i64toi32_i32$0 = $8($0_1);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $1_1 = i64toi32_i32$0;
   $1$hi = i64toi32_i32$1;
@@ -471,10 +463,6 @@ function asmFunc(global, env, buffer) {
   return $1_1;
  }
  
- function legalstub$11($0_1) {
-  return +$11($0_1);
- }
- 
  function legalstub$12($0_1, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
@@ -502,7 +490,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return +$12(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
+  return $12(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function legalstub$14($0_1, $1_1) {
@@ -535,10 +523,6 @@ function asmFunc(global, env, buffer) {
   return $14(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$15($0_1) {
-  return +$15($0_1);
- }
- 
  function legalstub$16($0_1, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
@@ -566,7 +550,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return +$16(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
+  return $16(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function legalstub$18($0_1, $1_1) {
@@ -599,18 +583,6 @@ function asmFunc(global, env, buffer) {
   return $18(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$19($0_1) {
-  return $19(Math_fround($0_1));
- }
- 
- function legalstub$20($0_1) {
-  return +$20($0_1);
- }
- 
- function legalstub$21($0_1) {
-  return +$21($0_1);
- }
- 
  function legalstub$22($0_1, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
@@ -641,10 +613,6 @@ function asmFunc(global, env, buffer) {
   return $22(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$23($0_1) {
-  return $23(Math_fround($0_1));
- }
- 
  function legalstub$24($0_1) {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $8_1 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $24($0_1);
@@ -676,27 +644,27 @@ function asmFunc(global, env, buffer) {
   "i64_extend_s_i32": legalstub$0, 
   "i64_extend_u_i32": legalstub$1, 
   "i32_wrap_i64": legalstub$2, 
-  "i32_trunc_s_f32": legalstub$3, 
-  "i32_trunc_u_f32": legalstub$4, 
+  "i32_trunc_s_f32": $3, 
+  "i32_trunc_u_f32": $4, 
   "i32_trunc_s_f64": $5, 
   "i32_trunc_u_f64": $6, 
   "i64_trunc_s_f32": legalstub$7, 
   "i64_trunc_u_f32": legalstub$8, 
   "i64_trunc_s_f64": legalstub$9, 
   "i64_trunc_u_f64": legalstub$10, 
-  "f32_convert_s_i32": legalstub$11, 
+  "f32_convert_s_i32": $11, 
   "f32_convert_s_i64": legalstub$12, 
   "f64_convert_s_i32": $13, 
   "f64_convert_s_i64": legalstub$14, 
-  "f32_convert_u_i32": legalstub$15, 
+  "f32_convert_u_i32": $15, 
   "f32_convert_u_i64": legalstub$16, 
   "f64_convert_u_i32": $17, 
   "f64_convert_u_i64": legalstub$18, 
-  "f64_promote_f32": legalstub$19, 
-  "f32_demote_f64": legalstub$20, 
-  "f32_reinterpret_i32": legalstub$21, 
+  "f64_promote_f32": $19, 
+  "f32_demote_f64": $20, 
+  "f32_reinterpret_i32": $21, 
   "f64_reinterpret_i64": legalstub$22, 
-  "i32_reinterpret_f32": legalstub$23, 
+  "i32_reinterpret_f32": $23, 
   "i64_reinterpret_f64": legalstub$24
  };
 }
diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js
index 41c829279..3bd0c42a8 100644
--- a/test/wasm2js/endianness.2asm.js
+++ b/test/wasm2js/endianness.2asm.js
@@ -543,10 +543,6 @@ function asmFunc(global, env, buffer) {
   return $2;
  }
  
- function legalstub$14($0) {
-  return +$14(Math_fround($0));
- }
- 
  function legalstub$18($0, $1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
@@ -700,10 +696,6 @@ function asmFunc(global, env, buffer) {
   return $2;
  }
  
- function legalstub$21($0) {
-  return +$21(Math_fround($0));
- }
- 
  var FUNCTION_TABLE = [];
  function __wasm_grow_memory(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
@@ -741,14 +733,14 @@ function asmFunc(global, env, buffer) {
   "i64_load32_s": legalstub$11, 
   "i64_load32_u": legalstub$12, 
   "i64_load": legalstub$13, 
-  "f32_load": legalstub$14, 
+  "f32_load": $14, 
   "f64_load": $15, 
   "i32_store16": $16, 
   "i32_store": $17, 
   "i64_store16": legalstub$18, 
   "i64_store32": legalstub$19, 
   "i64_store": legalstub$20, 
-  "f32_store": legalstub$21, 
+  "f32_store": $21, 
   "f64_store": $22
  };
 }
diff --git a/test/wasm2js/f32.2asm.js b/test/wasm2js/f32.2asm.js
index a6c7d182b..8615d293c 100644
--- a/test/wasm2js/f32.2asm.js
+++ b/test/wasm2js/f32.2asm.js
@@ -120,62 +120,6 @@ function asmFunc(global, env, buffer) {
   return Math_fround((wasm2js_scratch_store_i32(0, (wasm2js_scratch_store_f32(x), wasm2js_scratch_load_i32(0)) & 2147483647 | (wasm2js_scratch_store_f32(y), wasm2js_scratch_load_i32(0)) & -2147483648), wasm2js_scratch_load_f32()));
  }
  
- function legalstub$0($0_1, $1_1) {
-  return +$0(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$1($0_1, $1_1) {
-  return +$1(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$2($0_1, $1_1) {
-  return +$2(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$3($0_1, $1_1) {
-  return +$3(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$4($0_1) {
-  return +$4(Math_fround($0_1));
- }
- 
- function legalstub$5($0_1, $1_1) {
-  return +$5(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$6($0_1, $1_1) {
-  return +$6(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$7($0_1) {
-  return +$7(Math_fround($0_1));
- }
- 
- function legalstub$8($0_1) {
-  return +$8(Math_fround($0_1));
- }
- 
- function legalstub$9($0_1) {
-  return +$9(Math_fround($0_1));
- }
- 
- function legalstub$10($0_1) {
-  return +$10(Math_fround($0_1));
- }
- 
- function legalstub$11($0_1) {
-  return +$11(Math_fround($0_1));
- }
- 
- function legalstub$12($0_1) {
-  return +$12(Math_fround($0_1));
- }
- 
- function legalstub$13($0_1, $1_1) {
-  return +$13(Math_fround($0_1), Math_fround($1_1));
- }
- 
  function __wasm_nearest_f32(var$0) {
   var var$1 = Math_fround(0), var$2 = Math_fround(0), wasm2js_f32$0 = Math_fround(0), wasm2js_f32$1 = Math_fround(0), wasm2js_i32$0 = 0;
   var$1 = Math_fround(Math_floor(var$0));
@@ -200,20 +144,20 @@ function asmFunc(global, env, buffer) {
  
  var FUNCTION_TABLE = [];
  return {
-  "add": legalstub$0, 
-  "sub": legalstub$1, 
-  "mul": legalstub$2, 
-  "div": legalstub$3, 
-  "sqrt": legalstub$4, 
-  "min": legalstub$5, 
-  "max": legalstub$6, 
-  "ceil": legalstub$7, 
-  "floor": legalstub$8, 
-  "trunc": legalstub$9, 
-  "nearest": legalstub$10, 
-  "abs": legalstub$11, 
-  "neg": legalstub$12, 
-  "copysign": legalstub$13
+  "add": $0, 
+  "sub": $1, 
+  "mul": $2, 
+  "div": $3, 
+  "sqrt": $4, 
+  "min": $5, 
+  "max": $6, 
+  "ceil": $7, 
+  "floor": $8, 
+  "trunc": $9, 
+  "nearest": $10, 
+  "abs": $11, 
+  "neg": $12, 
+  "copysign": $13
  };
 }
 
diff --git a/test/wasm2js/f32_cmp.2asm.js b/test/wasm2js/f32_cmp.2asm.js
index bd272335c..671db639d 100644
--- a/test/wasm2js/f32_cmp.2asm.js
+++ b/test/wasm2js/f32_cmp.2asm.js
@@ -57,38 +57,14 @@ function asmFunc(global, env, buffer) {
   return x >= y | 0;
  }
  
- function legalstub$0($0_1, $1_1) {
-  return $0(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$1($0_1, $1_1) {
-  return $1(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$2($0_1, $1_1) {
-  return $2(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$3($0_1, $1_1) {
-  return $3(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$4($0_1, $1_1) {
-  return $4(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$5($0_1, $1_1) {
-  return $5(Math_fround($0_1), Math_fround($1_1));
- }
- 
  var FUNCTION_TABLE = [];
  return {
-  "eq": legalstub$0, 
-  "ne": legalstub$1, 
-  "lt": legalstub$2, 
-  "le": legalstub$3, 
-  "gt": legalstub$4, 
-  "ge": legalstub$5
+  "eq": $0, 
+  "ne": $1, 
+  "lt": $2, 
+  "le": $3, 
+  "gt": $4, 
+  "ge": $5
  };
 }
 
diff --git a/test/wasm2js/float-ops.2asm.js b/test/wasm2js/float-ops.2asm.js
index 4d691213a..ce5149482 100644
--- a/test/wasm2js/float-ops.2asm.js
+++ b/test/wasm2js/float-ops.2asm.js
@@ -357,90 +357,6 @@ function asmFunc(global, env, buffer) {
   return ~~i64toi32_i32$0 >>> 0 == (0 | 0) & (i64toi32_i32$1 | 0) == (0 | 0);
  }
  
- function legalstub$1($0, $1_1) {
-  return +$1(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$2($0, $1_1) {
-  return +$2(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$3($0, $1_1) {
-  return +$3(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$4($0, $1_1) {
-  return +$4(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$9($0, $1_1) {
-  return $9(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$10($0, $1_1) {
-  return $10(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$11($0, $1_1) {
-  return $11(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$12($0, $1_1) {
-  return $12(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$13($0, $1_1) {
-  return $13(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$14($0, $1_1) {
-  return $14(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$21($0, $1_1) {
-  return +$21(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$22($0, $1_1) {
-  return +$22(Math_fround($0), Math_fround($1_1));
- }
- 
- function legalstub$25($0) {
-  return $25(Math_fround($0));
- }
- 
- function legalstub$26($0) {
-  return +$26($0);
- }
- 
- function legalstub$27($0) {
-  return +$27(Math_fround($0));
- }
- 
- function legalstub$28($0) {
-  return +$28(Math_fround($0));
- }
- 
- function legalstub$31($0) {
-  return +$31(Math_fround($0));
- }
- 
- function legalstub$35($0) {
-  return +$35($0);
- }
- 
- function legalstub$37($0) {
-  return +$37($0);
- }
- 
- function legalstub$39($0) {
-  return $39(Math_fround($0));
- }
- 
- function legalstub$41($0) {
-  return $41(Math_fround($0));
- }
- 
  function legalstub$43($0, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10_1 = 0, $3_1 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
@@ -468,7 +384,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return +$43(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
+  return $43(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function legalstub$44($0, $1_1) {
@@ -528,7 +444,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return +$45(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
+  return $45(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function legalstub$46($0, $1_1) {
@@ -561,63 +477,55 @@ function asmFunc(global, env, buffer) {
   return $46(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$47($0) {
-  return $47(Math_fround($0));
- }
- 
- function legalstub$49($0) {
-  return $49(Math_fround($0));
- }
- 
  var FUNCTION_TABLE = [];
  return {
-  "f32_add": legalstub$1, 
-  "f32_sub": legalstub$2, 
-  "f32_mul": legalstub$3, 
-  "f32_div": legalstub$4, 
+  "f32_add": $1, 
+  "f32_sub": $2, 
+  "f32_mul": $3, 
+  "f32_div": $4, 
   "f64_add": $5, 
   "f64_sub": $6, 
   "f64_mul": $7, 
   "f64_div": $8, 
-  "f32_eq": legalstub$9, 
-  "f32_ne": legalstub$10, 
-  "f32_ge": legalstub$11, 
-  "f32_gt": legalstub$12, 
-  "f32_le": legalstub$13, 
-  "f32_lt": legalstub$14, 
+  "f32_eq": $9, 
+  "f32_ne": $10, 
+  "f32_ge": $11, 
+  "f32_gt": $12, 
+  "f32_le": $13, 
+  "f32_lt": $14, 
   "f64_eq": $15, 
   "f64_ne": $16, 
   "f64_ge": $17, 
   "f64_gt": $18, 
   "f64_le": $19, 
   "f64_lt": $20, 
-  "f32_min": legalstub$21, 
-  "f32_max": legalstub$22, 
+  "f32_min": $21, 
+  "f32_max": $22, 
   "f64_min": $23, 
   "f64_max": $24, 
-  "f64_promote": legalstub$25, 
-  "f32_demote": legalstub$26, 
-  "f32_floor": legalstub$27, 
-  "f32_ceil": legalstub$28, 
+  "f64_promote": $25, 
+  "f32_demote": $26, 
+  "f32_floor": $27, 
+  "f32_ceil": $28, 
   "f64_floor": $29, 
   "f64_ceil": $30, 
-  "f32_sqrt": legalstub$31, 
+  "f32_sqrt": $31, 
   "f64_sqrt": $32, 
-  "i32_to_f32": legalstub$35, 
+  "i32_to_f32": $35, 
   "i32_to_f64": $36, 
-  "u32_to_f32": legalstub$37, 
+  "u32_to_f32": $37, 
   "u32_to_f64": $38, 
-  "f32_to_i32": legalstub$39, 
+  "f32_to_i32": $39, 
   "f64_to_i32": $40, 
-  "f32_to_u32": legalstub$41, 
+  "f32_to_u32": $41, 
   "f64_to_u32": $42, 
   "i64_to_f32": legalstub$43, 
   "i64_to_f64": legalstub$44, 
   "u64_to_f32": legalstub$45, 
   "u64_to_f64": legalstub$46, 
-  "f32_to_i64": legalstub$47, 
+  "f32_to_i64": $47, 
   "f64_to_i64": $48, 
-  "f32_to_u64": legalstub$49, 
+  "f32_to_u64": $49, 
   "f64_to_u64": $50
  };
 }
diff --git a/test/wasm2js/float_misc.2asm.js b/test/wasm2js/float_misc.2asm.js
index 0e4c241e8..8e28dbb96 100644
--- a/test/wasm2js/float_misc.2asm.js
+++ b/test/wasm2js/float_misc.2asm.js
@@ -229,62 +229,6 @@ function asmFunc(global, env, buffer) {
   return +Math_max(x, y);
  }
  
- function legalstub$0($0_1, $1_1) {
-  return +$0(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$1($0_1, $1_1) {
-  return +$1(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$2($0_1, $1_1) {
-  return +$2(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$3($0_1, $1_1) {
-  return +$3(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$4($0_1) {
-  return +$4(Math_fround($0_1));
- }
- 
- function legalstub$5($0_1) {
-  return +$5(Math_fround($0_1));
- }
- 
- function legalstub$6($0_1) {
-  return +$6(Math_fround($0_1));
- }
- 
- function legalstub$7($0_1, $1_1) {
-  return +$7(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$8($0_1) {
-  return +$8(Math_fround($0_1));
- }
- 
- function legalstub$9($0_1) {
-  return +$9(Math_fround($0_1));
- }
- 
- function legalstub$10($0_1) {
-  return +$10(Math_fround($0_1));
- }
- 
- function legalstub$11($0_1) {
-  return +$11(Math_fround($0_1));
- }
- 
- function legalstub$12($0_1, $1_1) {
-  return +$12(Math_fround($0_1), Math_fround($1_1));
- }
- 
- function legalstub$13($0_1, $1_1) {
-  return +$13(Math_fround($0_1), Math_fround($1_1));
- }
- 
  function __wasm_nearest_f32(var$0) {
   var var$1 = Math_fround(0), var$2 = Math_fround(0), wasm2js_f32$0 = Math_fround(0), wasm2js_f32$1 = Math_fround(0), wasm2js_i32$0 = 0;
   var$1 = Math_fround(Math_floor(var$0));
@@ -331,20 +275,20 @@ function asmFunc(global, env, buffer) {
  
  var FUNCTION_TABLE = [];
  return {
-  "f32_add": legalstub$0, 
-  "f32_sub": legalstub$1, 
-  "f32_mul": legalstub$2, 
-  "f32_div": legalstub$3, 
-  "f32_sqrt": legalstub$4, 
-  "f32_abs": legalstub$5, 
-  "f32_neg": legalstub$6, 
-  "f32_copysign": legalstub$7, 
-  "f32_ceil": legalstub$8, 
-  "f32_floor": legalstub$9, 
-  "f32_trunc": legalstub$10, 
-  "f32_nearest": legalstub$11, 
-  "f32_min": legalstub$12, 
-  "f32_max": legalstub$13, 
+  "f32_add": $0, 
+  "f32_sub": $1, 
+  "f32_mul": $2, 
+  "f32_div": $3, 
+  "f32_sqrt": $4, 
+  "f32_abs": $5, 
+  "f32_neg": $6, 
+  "f32_copysign": $7, 
+  "f32_ceil": $8, 
+  "f32_floor": $9, 
+  "f32_trunc": $10, 
+  "f32_nearest": $11, 
+  "f32_min": $12, 
+  "f32_max": $13, 
   "f64_add": $14, 
   "f64_sub": $15, 
   "f64_mul": $16, 
diff --git a/test/wasm2js/func.2asm.js b/test/wasm2js/func.2asm.js
index c96d4a889..b87622a7d 100644
--- a/test/wasm2js/func.2asm.js
+++ b/test/wasm2js/func.2asm.js
@@ -450,10 +450,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$25() {
-  return +$25();
- }
- 
  function legalstub$28() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $28();
@@ -480,10 +476,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$29() {
-  return +$29();
- }
- 
  function legalstub$33($0, $1, $2_1, $3) {
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, $21 = 0, $22 = 0, $23_1 = 0, $6 = 0, $6$hi = 0, $9$hi = 0, $10 = 0, $10$hi = 0, $12 = 0, $12$hi = 0, $15$hi = 0, $16 = 0, $16$hi = 0, $4 = 0, $4$hi = 0;
   i64toi32_i32$0 = 0;
@@ -566,10 +558,6 @@ function asmFunc(global, env, buffer) {
   return $4;
  }
  
- function legalstub$34($0, $1) {
-  return +$34(Math_fround($0), Math_fround($1));
- }
- 
  function legalstub$37($0, $1, $2_1, $3) {
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, $21 = 0, $22 = 0, $23_1 = 0, $6 = 0, $6$hi = 0, $9$hi = 0, $10 = 0, $10$hi = 0, $12 = 0, $12$hi = 0, $15$hi = 0, $16 = 0, $16$hi = 0, $4 = 0, $4$hi = 0;
   i64toi32_i32$0 = 0;
@@ -652,17 +640,13 @@ function asmFunc(global, env, buffer) {
   return $4;
  }
  
- function legalstub$38($0, $1) {
-  return +$38(Math_fround($0), Math_fround($1));
- }
- 
  function legalstub$40($0, $1, $2_1, $3, $4, $5, $6) {
-  var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $17 = 0, $8 = Math_fround(0), $9 = 0, $11 = 0, $11$hi = 0, $14$hi = 0;
-  $8 = Math_fround($0);
-  $9 = $1;
+  var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $17 = 0, $7 = Math_fround(0), $8 = 0, $10 = 0, $10$hi = 0, $13$hi = 0;
+  $7 = $0;
+  $8 = $1;
   i64toi32_i32$0 = 0;
-  $11 = $2_1;
-  $11$hi = i64toi32_i32$0;
+  $10 = $2_1;
+  $10$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$2 = $3;
   i64toi32_i32$1 = 0;
@@ -679,13 +663,13 @@ function asmFunc(global, env, buffer) {
     $17 = i64toi32_i32$2 << i64toi32_i32$4;
    }
   }
-  $14$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $11$hi;
-  i64toi32_i32$0 = $11;
-  i64toi32_i32$2 = $14$hi;
+  $13$hi = i64toi32_i32$1;
+  i64toi32_i32$1 = $10$hi;
+  i64toi32_i32$0 = $10;
+  i64toi32_i32$2 = $13$hi;
   i64toi32_i32$3 = $17;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return $40($8, $9, i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $4, $5, $6);
+  return $40($7, $8, i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $4, $5, $6);
  }
  
  function legalstub$44() {
@@ -714,10 +698,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$45() {
-  return +$45();
- }
- 
  function legalstub$51() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $51();
@@ -744,10 +724,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$52() {
-  return +$52();
- }
- 
  function legalstub$57() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $57();
@@ -774,10 +750,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$58() {
-  return +$58();
- }
- 
  function legalstub$68() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $68();
@@ -804,50 +776,46 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$69() {
-  return +$69();
- }
- 
  var FUNCTION_TABLE = [complex_sig_3, empty_sig_2, complex_sig_1, complex_sig_3, empty_sig_1];
  return {
   "f": $2, 
   "g": h, 
   "local_first_i32": $23, 
   "local_first_i64": legalstub$24, 
-  "local_first_f32": legalstub$25, 
+  "local_first_f32": $25, 
   "local_first_f64": $26, 
   "local_second_i32": $27, 
   "local_second_i64": legalstub$28, 
-  "local_second_f32": legalstub$29, 
+  "local_second_f32": $29, 
   "local_second_f64": $30, 
   "local_mixed": $31, 
   "param_first_i32": $32, 
   "param_first_i64": legalstub$33, 
-  "param_first_f32": legalstub$34, 
+  "param_first_f32": $34, 
   "param_first_f64": $35, 
   "param_second_i32": $36, 
   "param_second_i64": legalstub$37, 
-  "param_second_f32": legalstub$38, 
+  "param_second_f32": $38, 
   "param_second_f64": $39, 
   "param_mixed": legalstub$40, 
   "empty": $41, 
   "value_void": $42, 
   "value_i32": $43, 
   "value_i64": legalstub$44, 
-  "value_f32": legalstub$45, 
+  "value_f32": $45, 
   "value_f64": $46, 
   "value_block_void": $47, 
   "value_block_i32": $48, 
   "return_empty": $49, 
   "return_i32": $50, 
   "return_i64": legalstub$51, 
-  "return_f32": legalstub$52, 
+  "return_f32": $52, 
   "return_f64": $53, 
   "return_block_i32": $54, 
   "break_empty": $55, 
   "break_i32": $56, 
   "break_i64": legalstub$57, 
-  "break_f32": legalstub$58, 
+  "break_f32": $58, 
   "break_f64": $59, 
   "break_block_i32": $60, 
   "break_br_if_empty": $61, 
@@ -858,7 +826,7 @@ function asmFunc(global, env, buffer) {
   "break_br_table_nested_num": $66, 
   "init_local_i32": $67, 
   "init_local_i64": legalstub$68, 
-  "init_local_f32": legalstub$69, 
+  "init_local_f32": $69, 
   "init_local_f64": $70, 
   "signature_explicit_reused": $76, 
   "signature_implicit_reused": $77, 
diff --git a/test/wasm2js/get_local.2asm.js b/test/wasm2js/get_local.2asm.js
index 891a4950e..ddf0c30fa 100644
--- a/test/wasm2js/get_local.2asm.js
+++ b/test/wasm2js/get_local.2asm.js
@@ -130,10 +130,6 @@ function asmFunc(global, env, buffer) {
   return $0_1;
  }
  
- function legalstub$2() {
-  return +$2();
- }
- 
  function legalstub$5($0_1, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
@@ -185,10 +181,6 @@ function asmFunc(global, env, buffer) {
   return $2_1;
  }
  
- function legalstub$6($0_1) {
-  return +$6(Math_fround($0_1));
- }
- 
  function legalstub$8($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $14 = 0, $7_1 = 0, $7$hi = 0, $10$hi = 0;
   i64toi32_i32$0 = 0;
@@ -216,7 +208,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $10$hi;
   i64toi32_i32$3 = $14;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
  }
  
  function legalstub$9($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
@@ -246,18 +238,18 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $10$hi;
   i64toi32_i32$3 = $14;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  return $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
  }
  
  var FUNCTION_TABLE = [];
  return {
   "type_local_i32": $0, 
   "type_local_i64": legalstub$1, 
-  "type_local_f32": legalstub$2, 
+  "type_local_f32": $2, 
   "type_local_f64": $3, 
   "type_param_i32": $4, 
   "type_param_i64": legalstub$5, 
-  "type_param_f32": legalstub$6, 
+  "type_param_f32": $6, 
   "type_param_f64": $7, 
   "type_mixed": legalstub$8, 
   "read": legalstub$9
diff --git a/test/wasm2js/loop.2asm.js b/test/wasm2js/loop.2asm.js
index 948617604..3ed99264a 100644
--- a/test/wasm2js/loop.2asm.js
+++ b/test/wasm2js/loop.2asm.js
@@ -445,10 +445,6 @@ function asmFunc(global, env, buffer) {
   return $2_1;
  }
  
- function legalstub$18($0, $1_1) {
-  return +$18(Math_fround($0), Math_fround($1_1));
- }
- 
  function _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0, var$0$hi, var$1, var$1$hi) {
   var i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, var$2 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21 = 0, $22 = 0, var$6 = 0, $24 = 0, $17_1 = 0, $18_1 = 0, $23 = 0, $29 = 0, $45 = 0, $56$hi = 0, $62$hi = 0;
   i64toi32_i32$0 = var$1$hi;
@@ -565,7 +561,7 @@ function asmFunc(global, env, buffer) {
   "effects": fx, 
   "while_": legalstub$16, 
   "for_": legalstub$17, 
-  "nesting": legalstub$18
+  "nesting": $18
  };
 }
 
diff --git a/test/wasm2js/select.2asm.js b/test/wasm2js/select.2asm.js
index c50a01a47..07de1de95 100644
--- a/test/wasm2js/select.2asm.js
+++ b/test/wasm2js/select.2asm.js
@@ -159,15 +159,11 @@ function asmFunc(global, env, buffer) {
   return $5_1;
  }
  
- function legalstub$2($0_1, $1_1, $2_1) {
-  return +$2(Math_fround($0_1), Math_fround($1_1), $2_1);
- }
- 
  var FUNCTION_TABLE = [];
  return {
   "select_i32": $0, 
   "select_i64": legalstub$1, 
-  "select_f32": legalstub$2, 
+  "select_f32": $2, 
   "select_f64": $3, 
   "select_trap_l": $4, 
   "select_trap_r": $5
diff --git a/test/wasm2js/set_local.2asm.js b/test/wasm2js/set_local.2asm.js
index cbb346aa6..1eba7bcd2 100644
--- a/test/wasm2js/set_local.2asm.js
+++ b/test/wasm2js/set_local.2asm.js
@@ -137,10 +137,6 @@ function asmFunc(global, env, buffer) {
   $5(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
- function legalstub$6($0_1) {
-  $6(Math_fround($0_1));
- }
- 
  function legalstub$8($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $14 = 0, $7_1 = 0, $7$hi = 0, $10$hi = 0;
   i64toi32_i32$0 = 0;
@@ -168,7 +164,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $10$hi;
   i64toi32_i32$3 = $14;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
  }
  
  function legalstub$9($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
@@ -198,7 +194,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $11$hi;
   i64toi32_i32$3 = $16;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  i64toi32_i32$2 = $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  i64toi32_i32$2 = $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $6_1 = i64toi32_i32$2;
   $6$hi = i64toi32_i32$0;
@@ -230,7 +226,7 @@ function asmFunc(global, env, buffer) {
   "type_local_f64": $3, 
   "type_param_i32": $4, 
   "type_param_i64": legalstub$5, 
-  "type_param_f32": legalstub$6, 
+  "type_param_f32": $6, 
   "type_param_f64": $7, 
   "type_mixed": legalstub$8, 
   "write": legalstub$9
diff --git a/test/wasm2js/tee_local.2asm.js b/test/wasm2js/tee_local.2asm.js
index d41d1b560..50ed49d10 100644
--- a/test/wasm2js/tee_local.2asm.js
+++ b/test/wasm2js/tee_local.2asm.js
@@ -168,10 +168,6 @@ function asmFunc(global, env, buffer) {
   return $0_1;
  }
  
- function legalstub$2() {
-  return +$2();
- }
- 
  function legalstub$5($0_1, $1_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12 = 0, $13 = 0, $4_1 = 0, $4$hi = 0, $7$hi = 0, $2_1 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
@@ -223,10 +219,6 @@ function asmFunc(global, env, buffer) {
   return $2_1;
  }
  
- function legalstub$6($0_1) {
-  return +$6(Math_fround($0_1));
- }
- 
  function legalstub$8($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $14 = 0, $7_1 = 0, $7$hi = 0, $10$hi = 0;
   i64toi32_i32$0 = 0;
@@ -254,7 +246,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $10$hi;
   i64toi32_i32$3 = $14;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  $8(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
  }
  
  function legalstub$9($0_1, $1_1, $2_1, $3_1, $4_1, $5_1) {
@@ -284,7 +276,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $11$hi;
   i64toi32_i32$3 = $16;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  i64toi32_i32$2 = $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  i64toi32_i32$2 = $9(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $6_1 = i64toi32_i32$2;
   $6$hi = i64toi32_i32$0;
@@ -335,18 +327,18 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $10$hi;
   i64toi32_i32$3 = $14;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return $10(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, Math_fround($2_1), $3_1, $4_1, $5_1);
+  return $10(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2, $2_1, $3_1, $4_1, $5_1);
  }
  
  var FUNCTION_TABLE = [];
  return {
   "type_local_i32": $0, 
   "type_local_i64": legalstub$1, 
-  "type_local_f32": legalstub$2, 
+  "type_local_f32": $2, 
   "type_local_f64": $3, 
   "type_param_i32": $4, 
   "type_param_i64": legalstub$5, 
-  "type_param_f32": legalstub$6, 
+  "type_param_f32": $6, 
   "type_param_f64": $7, 
   "type_mixed": legalstub$8, 
   "write": legalstub$9, 
diff --git a/test/wasm2js/traps.2asm.js b/test/wasm2js/traps.2asm.js
index c47b738ab..294086f24 100644
--- a/test/wasm2js/traps.2asm.js
+++ b/test/wasm2js/traps.2asm.js
@@ -1917,17 +1917,9 @@ function asmFunc(global, env, buffer) {
   return i64toi32_i32$2 | 0;
  }
  
- function legalstub$0($0_1) {
-  return $0(Math_fround($0_1));
- }
- 
- function legalstub$1($0_1) {
-  return $1(Math_fround($0_1));
- }
- 
  function legalstub$4($0_1) {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $8 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $4(Math_fround($0_1));
+  i64toi32_i32$0 = $4($0_1);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $1_1 = i64toi32_i32$0;
   $1$hi = i64toi32_i32$1;
@@ -1953,7 +1945,7 @@ function asmFunc(global, env, buffer) {
  
  function legalstub$5($0_1) {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $8 = 0, $1_1 = 0, $1$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $5(Math_fround($0_1));
+  i64toi32_i32$0 = $5($0_1);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $1_1 = i64toi32_i32$0;
   $1$hi = i64toi32_i32$1;
@@ -2031,8 +2023,8 @@ function asmFunc(global, env, buffer) {
  
  var FUNCTION_TABLE = [];
  return {
-  "no_dce_i32_trunc_s_f32": legalstub$0, 
-  "no_dce_i32_trunc_u_f32": legalstub$1, 
+  "no_dce_i32_trunc_s_f32": $0, 
+  "no_dce_i32_trunc_u_f32": $1, 
   "no_dce_i32_trunc_s_f64": $2, 
   "no_dce_i32_trunc_u_f64": $3, 
   "no_dce_i64_trunc_s_f32": legalstub$4, 
@@ -2129,10 +2121,6 @@ function asmFunc(global, env, buffer) {
   return $1_1;
  }
  
- function legalstub$2($0_1) {
-  return +$2($0_1);
- }
- 
  var FUNCTION_TABLE = [];
  function __wasm_grow_memory(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
@@ -2164,7 +2152,7 @@ function asmFunc(global, env, buffer) {
  return {
   "no_dce_i32_load": $0, 
   "no_dce_i64_load": legalstub$1, 
-  "no_dce_f32_load": legalstub$2, 
+  "no_dce_f32_load": $2, 
   "no_dce_f64_load": $3
  };
 }
diff --git a/test/wasm2js/unaligned.2asm.js b/test/wasm2js/unaligned.2asm.js
index f15cb0601..51e4bf269 100644
--- a/test/wasm2js/unaligned.2asm.js
+++ b/test/wasm2js/unaligned.2asm.js
@@ -134,15 +134,11 @@ function asmFunc(global, env, buffer) {
   return $0_1;
  }
  
- function legalstub$2() {
-  return +$2();
- }
- 
  var FUNCTION_TABLE = [];
  return {
   "i32_load": $0, 
   "i64_load": legalstub$1, 
-  "f32_load": legalstub$2, 
+  "f32_load": $2, 
   "f64_load": $3, 
   "i32_store": $4, 
   "i64_store": $5, 
diff --git a/test/wasm2js/unreachable.2asm.js b/test/wasm2js/unreachable.2asm.js
index bf8193884..074da4558 100644
--- a/test/wasm2js/unreachable.2asm.js
+++ b/test/wasm2js/unreachable.2asm.js
@@ -326,10 +326,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$41() {
-  return +$41();
- }
- 
  function legalstub$42() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $42();
@@ -356,10 +352,6 @@ function asmFunc(global, env, buffer) {
   return $0;
  }
  
- function legalstub$47() {
-  return +$47();
- }
- 
  function legalstub$49() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7_1 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $49();
@@ -427,13 +419,13 @@ function asmFunc(global, env, buffer) {
   "as_call_indirect_mid": $38, 
   "as_call_indirect_last": $39, 
   "as_local_set_value": $40, 
-  "as_load_address": legalstub$41, 
+  "as_load_address": $41, 
   "as_loadN_address": legalstub$42, 
   "as_store_address": $43, 
   "as_store_value": $44, 
   "as_storeN_address": $45, 
   "as_storeN_value": $46, 
-  "as_unary_operand": legalstub$47, 
+  "as_unary_operand": $47, 
   "as_binary_left": $48, 
   "as_binary_right": legalstub$49, 
   "as_test_operand": $50,