Update Binaryen to latest; Various fixes

tests/compiler/abi.optimized.wat

@@ -2,12 +2,15 @@
  (type $i (func (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\06\00\00\00a\00b\00i\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $abi/condition (mut i32) (i32.const 0))
  (global $abi/y (mut i32) (i32.const 0))
- (memory $0 1)
- (data (i32.const 8) "\06\00\00\00a\00b\00i\00.\00t\00s")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "exported" (func $abi/exported))
  (export "exportedExported" (func $abi/exportedExported))
  (export "exportedInternal" (func $abi/exportedInternal))

tests/compiler/abi.untouched.wat

@@ -2,15 +2,16 @@
  (type $i (func (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\06\00\00\00a\00b\00i\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $abi/condition (mut i32) (i32.const 0))
  (global $abi/y (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 24))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\06\00\00\00a\00b\00i\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "exported" (func $abi/exported))
  (export "exportedExported" (func $abi/exportedExported))
  (export "exportedInternal" (func $abi/exportedInternal))

tests/compiler/asc-constants.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $start)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/asc-constants.untouched.wat

@@ -1,5 +1,8 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $ASC_TARGET i32 (i32.const 0))
  (global $ASC_NO_TREESHAKING i32 (i32.const 0))
  (global $ASC_NO_ASSERT i32 (i32.const 0))
@@ -9,10 +12,8 @@
  (global $ASC_FEATURE_MUTABLE_GLOBAL i32 (i32.const 0))
  (global $ASC_FEATURE_SIGN_EXTENSION i32 (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 0 ;) (type $v)
   (drop

tests/compiler/assert.optimized.wat

@@ -3,7 +3,10 @@
  (memory $0 1)
  (data (i32.const 8) "\t\00\00\00a\00s\00s\00e\00r\00t\00.\00t\00s")
  (data (i32.const 32) "\0c\00\00\00m\00u\00s\00t\00 \00b\00e\00 \00t\00r\00u\00e")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $start)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/assert.untouched.wat

@@ -1,14 +1,15 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $HEAP_BASE i32 (i32.const 60))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\t\00\00\00a\00s\00s\00e\00r\00t\00.\00t\00s\00")
  (data (i32.const 32) "\0c\00\00\00m\00u\00s\00t\00 \00b\00e\00 \00t\00r\00u\00e\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $HEAP_BASE i32 (i32.const 60))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/binary.optimized.wat

@@ -2,13 +2,16 @@
  (type $v (func))
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (type $FUNCSIG$ff (func (param f32) (result f32)))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $binary/b (mut i32) (i32.const 0))
  (global $binary/i (mut i32) (i32.const 0))
  (global $binary/I (mut i64) (i64.const 0))
  (global $binary/f (mut f32) (f32.const 0))
  (global $binary/F (mut f64) (f64.const 0))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $~lib/math/NativeMath.pow (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$dd) (param $0 f64) (result f64)
   (local $1 i32)

tests/compiler/binary.untouched.wat

@@ -4,6 +4,9 @@
  (type $fff (func (param f32 f32) (result f32)))
  (type $fif (func (param f32 i32) (result f32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $binary/b (mut i32) (i32.const 0))
  (global $binary/i (mut i32) (i32.const 0))
  (global $NaN f64 (f64.const nan:0x8000000000000))
@@ -11,10 +14,8 @@
  (global $binary/f (mut f32) (f32.const 0))
  (global $binary/F (mut f64) (f64.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $~lib/math/NativeMath.scalbn (; 0 ;) (type $FiF) (param $0 f64) (param $1 i32) (result f64)
   (local $2 f64)

tests/compiler/builtins.optimized.wat

@@ -2,6 +2,11 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $iiv (func (param i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\0b\00\00\00b\00u\00i\00l\00t\00i\00n\00s\00.\00t\00s")
+ (data (i32.const 40) "\01\00\00\001")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $builtins/test $start~anonymous|1)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $builtins/b (mut i32) (i32.const 0))
  (global $builtins/i (mut i32) (i32.const 0))
@@ -12,11 +17,6 @@
  (global $builtins/U (mut i64) (i64.const 0))
  (global $builtins/s (mut i32) (i32.const 0))
  (global $builtins/fn (mut i32) (i32.const 1))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $builtins/test $start~anonymous|1)
- (memory $0 1)
- (data (i32.const 8) "\0b\00\00\00b\00u\00i\00l\00t\00i\00n\00s\00.\00t\00s")
- (data (i32.const 40) "\01\00\00\001")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $builtins/test))

tests/compiler/builtins.untouched.wat

@@ -2,6 +2,11 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $iiv (func (param i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\0b\00\00\00b\00u\00i\00l\00t\00i\00n\00s\00.\00t\00s\00")
+ (data (i32.const 40) "\01\00\00\001\00")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $start~anonymous|1)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $builtins/b (mut i32) (i32.const 0))
  (global $builtins/i (mut i32) (i32.const 0))
@@ -48,11 +53,6 @@
  (global $~lib/builtins/f64.EPSILON f64 (f64.const 2.220446049250313e-16))
  (global $~lib/builtins/f64.NaN f64 (f64.const nan:0x8000000000000))
  (global $HEAP_BASE i32 (i32.const 48))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $start~anonymous|1)
- (memory $0 1)
- (data (i32.const 8) "\0b\00\00\00b\00u\00i\00l\00t\00i\00n\00s\00.\00t\00s\00")
- (data (i32.const 40) "\01\00\00\001\00")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $builtins/test))

tests/compiler/call-inferred.optimized.wat

@@ -4,10 +4,13 @@
  (type $FUNCSIG$i (func (result i32)))
  (type $FUNCSIG$d (func (result f64)))
  (type $FUNCSIG$f (func (result f32)))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00i\00n\00f\00e\00r\00r\00e\00d\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $call-inferred/foo<i32> (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32)
   (i32.const 42)

tests/compiler/call-inferred.untouched.wat

@@ -4,13 +4,14 @@
  (type $FF (func (param f64) (result f64)))
  (type $ff (func (param f32) (result f32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $HEAP_BASE i32 (i32.const 44))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00i\00n\00f\00e\00r\00r\00e\00d\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $HEAP_BASE i32 (i32.const 44))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $call-inferred/foo<i32> (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (get_local $0)

tests/compiler/call-optional.optimized.wat

@@ -2,13 +2,13 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00o\00p\00t\00i\00o\00n\00a\00l\00.\00t\00s")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $call-optional/opt|trampoline)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $~argc (mut i32) (i32.const 0))
  (global $call-optional/optIndirect (mut i32) (i32.const 1))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $call-optional/opt|trampoline)
- (memory $0 1)
- (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00o\00p\00t\00i\00o\00n\00a\00l\00.\00t\00s")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/call-optional.untouched.wat

@@ -2,14 +2,14 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00o\00p\00t\00i\00o\00n\00a\00l\00.\00t\00s\00")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $call-optional/opt|trampoline)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $~argc (mut i32) (i32.const 0))
  (global $call-optional/optIndirect (mut i32) (i32.const 1))
  (global $HEAP_BASE i32 (i32.const 44))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $call-optional/opt|trampoline)
- (memory $0 1)
- (data (i32.const 8) "\10\00\00\00c\00a\00l\00l\00-\00o\00p\00t\00i\00o\00n\00a\00l\00.\00t\00s\00")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/class-extends.optimized.wat

@@ -2,7 +2,10 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-extends/test))
  (func $class-extends/test (; 0 ;) (; has Stack IR ;) (type $iv) (param $0 i32)
   (drop

tests/compiler/class-extends.untouched.wat

@@ -1,11 +1,12 @@
 (module
  (type $iv (func (param i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-extends/test))
  (func $class-extends/test (; 0 ;) (type $iv) (param $0 i32)
   (drop

tests/compiler/class-overloading.optimized.wat

@@ -3,7 +3,10 @@
  (type $v (func))
  (type $FUNCSIG$v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-overloading/test))
  (start $start)
  (func $class-overloading/Foo#baz (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$v)

tests/compiler/class-overloading.untouched.wat

@@ -1,11 +1,12 @@
 (module
  (type $iv (func (param i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-overloading/test))
  (start $start)
  (func $class-overloading/Foo#baz (; 0 ;) (type $iv) (param $0 i32)

tests/compiler/class-with-boolean-field.optimized.wat

@@ -2,7 +2,10 @@
  (type $i (func (result i32)))
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-with-boolean-field/test))
  (func $class-with-boolean-field/test (; 0 ;) (; has Stack IR ;) (type $i) (result i32)
   (i32.store8

tests/compiler/class-with-boolean-field.untouched.wat

@@ -1,11 +1,12 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class-with-boolean-field/test))
  (func $class-with-boolean-field/test (; 0 ;) (type $i) (result i32)
   (local $0 i32)

tests/compiler/class.optimized.wat

@@ -3,10 +3,13 @@
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
  (type $FUNCSIG$f (func (result f32)))
- (global $class/Animal.ONE (mut i32) (i32.const 1))
  (memory $0 1)
  (data (i32.const 8) "\08\00\00\00c\00l\00a\00s\00s\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $class/Animal.ONE (mut i32) (i32.const 1))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class/test))
  (start $start)
  (func $class/Animal.add (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32)

tests/compiler/class.untouched.wat

@@ -6,14 +6,15 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $ifff (func (param i32 f32 f32) (result f32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\08\00\00\00c\00l\00a\00s\00s\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $class/Animal.ONE (mut i32) (i32.const 1))
  (global $HEAP_BASE i32 (i32.const 28))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\08\00\00\00c\00l\00a\00s\00s\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $class/test))
  (start $start)
  (func $class/Animal.add (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)

tests/compiler/closure.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $null (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/closure.untouched.wat

@@ -1,10 +1,11 @@
 (module
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $null (; 0 ;) (type $v)
  )
 )

tests/compiler/comma.optimized.wat

@@ -1,12 +1,15 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\08\00\00\00c\00o\00m\00m\00a\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $comma/a (mut i32) (i32.const 0))
  (global $comma/b (mut i32) (i32.const 0))
- (memory $0 1)
- (data (i32.const 8) "\08\00\00\00c\00o\00m\00m\00a\00.\00t\00s")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (; has Stack IR ;) (type $v)
   (local $0 i32)

tests/compiler/comma.untouched.wat

@@ -1,15 +1,16 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\08\00\00\00c\00o\00m\00m\00a\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $comma/a (mut i32) (i32.const 0))
  (global $comma/b (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 28))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\08\00\00\00c\00o\00m\00m\00a\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/declare.optimized.wat

@@ -1,14 +1,17 @@
 (module
  (type $v (func))
  (type $iiiiv (func (param i32 i32 i32 i32)))
- (import "declare" "externalConstant" (global $declare/externalConstant i32))
- (import "declare" "externalFunction" (func $declare/externalFunction))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (import "my" "externalFunction" (func $declare/my.externalFunction))
- (import "my" "externalConstant" (global $declare/my.externalConstant i32))
  (memory $0 1)
  (data (i32.const 8) "\n\00\00\00d\00e\00c\00l\00a\00r\00e\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "declare" "externalConstant" (global $declare/externalConstant i32))
+ (import "declare" "my.externalConstant" (global $declare/my.externalConstant i32))
+ (import "declare" "externalFunction" (func $declare/externalFunction))
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (import "declare" "my.externalFunction" (func $declare/my.externalFunction))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 3 ;) (; has Stack IR ;) (type $v)
   (call $declare/externalFunction)

tests/compiler/declare.untouched.wat

@@ -1,17 +1,18 @@
 (module
  (type $v (func))
  (type $iiiiv (func (param i32 i32 i32 i32)))
- (import "declare" "externalConstant" (global $declare/externalConstant i32))
- (import "declare" "externalFunction" (func $declare/externalFunction))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (import "my" "externalFunction" (func $declare/my.externalFunction))
- (import "my" "externalConstant" (global $declare/my.externalConstant i32))
- (global $HEAP_BASE i32 (i32.const 32))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\n\00\00\00d\00e\00c\00l\00a\00r\00e\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "declare" "externalConstant" (global $declare/externalConstant i32))
+ (import "declare" "my.externalConstant" (global $declare/my.externalConstant i32))
+ (import "declare" "externalFunction" (func $declare/externalFunction))
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (import "declare" "my.externalFunction" (func $declare/my.externalFunction))
+ (global $HEAP_BASE i32 (i32.const 32))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 3 ;) (type $v)
   (call $declare/externalFunction)

tests/compiler/do.optimized.wat

@@ -1,13 +1,16 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\05\00\00\00d\00o\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $do/n (mut i32) (i32.const 10))
  (global $do/m (mut i32) (i32.const 0))
  (global $do/o (mut i32) (i32.const 0))
- (memory $0 1)
- (data (i32.const 8) "\05\00\00\00d\00o\00.\00t\00s")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (; has Stack IR ;) (type $v)
   (local $0 i32)

tests/compiler/do.untouched.wat

@@ -1,16 +1,17 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\05\00\00\00d\00o\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $do/n (mut i32) (i32.const 10))
  (global $do/m (mut i32) (i32.const 0))
  (global $do/o (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 24))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\05\00\00\00d\00o\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/empty.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $null (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/empty.untouched.wat

@@ -1,10 +1,11 @@
 (module
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $null (; 0 ;) (type $v)
  )
 )

tests/compiler/enum.optimized.wat

@@ -1,6 +1,9 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $enum/Implicit.ZERO i32 (i32.const 0))
  (global $enum/Implicit.ONE i32 (i32.const 1))
  (global $enum/Implicit.TWO i32 (i32.const 2))
@@ -17,8 +20,8 @@
  (global $enum/NonConstant.ONE (mut i32) (i32.const 0))
  (global $enum/SelfReference.ZERO i32 (i32.const 0))
  (global $enum/SelfReference.ONE i32 (i32.const 1))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "Implicit.ZERO" (global $enum/Implicit.ZERO))
  (export "Implicit.ONE" (global $enum/Implicit.ONE))
  (export "Implicit.TWO" (global $enum/Implicit.TWO))

tests/compiler/enum.untouched.wat

@@ -1,6 +1,9 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $enum/Implicit.ZERO i32 (i32.const 0))
  (global $enum/Implicit.ONE i32 (i32.const 1))
  (global $enum/Implicit.TWO i32 (i32.const 2))
@@ -19,10 +22,8 @@
  (global $enum/SelfReference.ONE i32 (i32.const 1))
  (global $enum/enumType (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "Implicit.ZERO" (global $enum/Implicit.ZERO))
  (export "Implicit.ONE" (global $enum/Implicit.ONE))
  (export "Implicit.TWO" (global $enum/Implicit.TWO))

tests/compiler/export.optimized.wat

@@ -1,11 +1,14 @@
 (module
  (type $iii (func (param i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $export/ns.two)
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "add" (func $export/add))
  (export "sub" (func $export/sub))
  (export "renamed_mul" (func $export/mul))

tests/compiler/export.untouched.wat

@@ -1,14 +1,15 @@
 (module
  (type $iii (func (param i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "add" (func $export/add))
  (export "sub" (func $export/sub))
  (export "renamed_mul" (func $export/mul))

tests/compiler/exports.optimized.wat

@@ -6,6 +6,9 @@
  (type $iv (func (param i32)))
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
  (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $exports/Animal.CAT i32 (i32.const 0))
@@ -16,8 +19,8 @@
  (global $exports/vehicles.Car.TIRES i32 (i32.const 4))
  (global $exports/outer.inner.a i32 (i32.const 42))
  (global $~argc (mut i32) (i32.const 0))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "add" (func $exports/add))
  (export "_setargc" (func $~setargc))
  (export "subOpt" (func $exports/subOpt|trampoline))

tests/compiler/exports.untouched.wat

@@ -5,6 +5,9 @@
  (type $iiv (func (param i32 i32)))
  (type $iv (func (param i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $~lib/internal/allocator/AL_BITS i32 (i32.const 3))
  (global $~lib/internal/allocator/AL_SIZE i32 (i32.const 8))
  (global $~lib/internal/allocator/AL_MASK i32 (i32.const 7))
@@ -20,10 +23,8 @@
  (global $exports/outer.inner.a i32 (i32.const 42))
  (global $HEAP_BASE i32 (i32.const 8))
  (global $~argc (mut i32) (i32.const 0))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "add" (func $exports/add))
  (export "_setargc" (func $~setargc))
  (export "subOpt" (func $exports/subOpt|trampoline))

tests/compiler/external.optimized.wat

@@ -1,12 +1,15 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "foo" "var" (global $external/var_ i32))
  (import "external" "foo" (func $external/foo))
- (import "foo" "bar" (func $external/foo.bar))
+ (import "external" "foo.bar" (func $external/foo.bar))
  (import "external" "bar" (func $external/two))
  (import "foo" "baz" (func $external/three))
- (import "foo" "var" (global $external/var_ i32))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "foo.bar" (func $external/foo.bar))
  (export "foo" (func $external/foo))
  (export "two" (func $external/two))

tests/compiler/external.ts

@@ -1,13 +1,13 @@
-export declare function foo(): void; // external.foo
+export declare function foo(): void; // external , foo
 export declare namespace foo {
-  export function bar(): void; // foo.bar
+  export function bar(): void; // external , foo.bar
 }
 
 @external("bar")
-export declare function two(): void; // external.bar
+export declare function two(): void; // external , bar
 
 @external("foo", "baz")
-export declare function three(): void; // foo.baz
+export declare function three(): void; // foo , baz
 
-@external("foo", "var")
+@external("foo", "var") // foo , var
 export declare const var_: i32;

tests/compiler/external.untouched.wat

@@ -1,15 +1,16 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "foo" "var" (global $external/var_ i32))
  (import "external" "foo" (func $external/foo))
- (import "foo" "bar" (func $external/foo.bar))
+ (import "external" "foo.bar" (func $external/foo.bar))
  (import "external" "bar" (func $external/two))
  (import "foo" "baz" (func $external/three))
- (import "foo" "var" (global $external/var_ i32))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "foo.bar" (func $external/foo.bar))
  (export "foo" (func $external/foo))
  (export "two" (func $external/two))

tests/compiler/for.optimized.wat

@@ -1,11 +1,14 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $for/i (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\06\00\00\00f\00o\00r\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $for/i (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (; has Stack IR ;) (type $v)
   (local $0 i32)

tests/compiler/for.untouched.wat

@@ -1,14 +1,15 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\06\00\00\00f\00o\00r\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $for/i (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 24))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\06\00\00\00f\00o\00r\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/function-expression.optimized.wat

@@ -3,16 +3,16 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (type $i (func (result i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\16\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00e\00x\00p\00r\00e\00s\00s\00i\00o\00n\00.\00t\00s")
+ (table 5 anyfunc)
+ (elem (i32.const 0) $start~someName|3 $start~anonymous|1 $start~anonymous|1 $start~someName|3 $start~anonymous|4)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $function-expression/f1 (mut i32) (i32.const 1))
  (global $~argc (mut i32) (i32.const 0))
  (global $function-expression/f2 (mut i32) (i32.const 2))
  (global $function-expression/f3 (mut i32) (i32.const 3))
  (global $function-expression/f4 (mut i32) (i32.const 4))
- (table 5 5 anyfunc)
- (elem (i32.const 0) $start~someName|3 $start~anonymous|1 $start~anonymous|1 $start~someName|3 $start~anonymous|4)
- (memory $0 1)
- (data (i32.const 8) "\16\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00e\00x\00p\00r\00e\00s\00s\00i\00o\00n\00.\00t\00s")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/function-expression.untouched.wat

@@ -3,6 +3,10 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (type $i (func (result i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\16\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00e\00x\00p\00r\00e\00s\00s\00i\00o\00n\00.\00t\00s\00")
+ (table 5 anyfunc)
+ (elem (i32.const 0) $null $start~anonymous|1 $start~anonymous|2 $start~someName|3 $start~anonymous|4)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $function-expression/f1 (mut i32) (i32.const 1))
  (global $~argc (mut i32) (i32.const 0))
@@ -10,10 +14,6 @@
  (global $function-expression/f3 (mut i32) (i32.const 3))
  (global $function-expression/f4 (mut i32) (i32.const 4))
  (global $HEAP_BASE i32 (i32.const 56))
- (table 5 5 anyfunc)
- (elem (i32.const 0) $null $start~anonymous|1 $start~anonymous|2 $start~someName|3 $start~anonymous|4)
- (memory $0 1)
- (data (i32.const 8) "\16\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00e\00x\00p\00r\00e\00s\00s\00i\00o\00n\00.\00t\00s\00")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/function-types.optimized.wat

@@ -7,14 +7,14 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\11\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00t\00y\00p\00e\00s\00.\00t\00s")
+ (table 5 anyfunc)
+ (elem (i32.const 0) $null $function-types/makeAdder<i32>~anonymous|1 $function-types/makeAdder<i64>~anonymous|2 $function-types/makeAdder<f64>~anonymous|3 $function-types/makeAdder<i32>~anonymous|1)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
  (global $~argc (mut i32) (i32.const 0))
  (global $function-types/i64Adder (mut i32) (i32.const 0))
- (table 5 5 anyfunc)
- (elem (i32.const 0) $null $function-types/makeAdder<i32>~anonymous|1 $function-types/makeAdder<i64>~anonymous|2 $function-types/makeAdder<f64>~anonymous|3 $function-types/makeAdder<i32>~anonymous|1)
- (memory $0 1)
- (data (i32.const 8) "\11\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00t\00y\00p\00e\00s\00.\00t\00s")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/function-types.untouched.wat

@@ -6,15 +6,15 @@
  (type $FFF (func (param f64 f64) (result f64)))
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\11\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00t\00y\00p\00e\00s\00.\00t\00s\00")
+ (table 5 anyfunc)
+ (elem (i32.const 0) $null $function-types/makeAdder<i32>~anonymous|1 $function-types/makeAdder<i64>~anonymous|2 $function-types/makeAdder<f64>~anonymous|3 $function-types/addI32)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
  (global $~argc (mut i32) (i32.const 0))
  (global $function-types/i64Adder (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 48))
- (table 5 5 anyfunc)
- (elem (i32.const 0) $null $function-types/makeAdder<i32>~anonymous|1 $function-types/makeAdder<i64>~anonymous|2 $function-types/makeAdder<f64>~anonymous|3 $function-types/addI32)
- (memory $0 1)
- (data (i32.const 8) "\11\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00t\00y\00p\00e\00s\00.\00t\00s\00")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (start $start)

tests/compiler/function.optimized.wat

@@ -10,7 +10,10 @@
  (type $FUNCSIG$f (func (result f32)))
  (type $FUNCSIG$d (func (result f64)))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $function/v)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $function/v (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)

tests/compiler/function.untouched.wat

@@ -14,11 +14,12 @@
  (type $IiI (func (param i64 i32) (result i64)))
  (type $fff (func (param f32 f32) (result f32)))
  (type $FFF (func (param f64 f64) (result f64)))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $function/v (; 0 ;) (type $v)
   (nop)

tests/compiler/getter-call.optimized.wat

@@ -3,12 +3,12 @@
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
+ (memory $0 0)
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $getter-call/C#get:x~anonymous|1)
  (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
  (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $~argc (mut i32) (i32.const 0))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $getter-call/C#get:x~anonymous|1)
- (memory $0 0)
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $getter-call/test))

tests/compiler/getter-call.untouched.wat

@@ -2,6 +2,9 @@
  (type $i (func (result i32)))
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $getter-call/C#get:x~anonymous|1)
  (global $~lib/internal/allocator/AL_BITS i32 (i32.const 3))
  (global $~lib/internal/allocator/AL_SIZE i32 (i32.const 8))
  (global $~lib/internal/allocator/AL_MASK i32 (i32.const 7))
@@ -10,9 +13,6 @@
  (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $~argc (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $getter-call/C#get:x~anonymous|1)
- (memory $0 0)
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $getter-call/test))

tests/compiler/getter-setter.optimized.wat

@@ -3,11 +3,14 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $iv (func (param i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $getter-setter/Foo._bar (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\10\00\00\00g\00e\00t\00t\00e\00r\00-\00s\00e\00t\00t\00e\00r\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $getter-setter/Foo._bar (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $getter-setter/Foo.get:bar (; 1 ;) (; has Stack IR ;) (type $i) (result i32)
   (get_global $getter-setter/Foo._bar)

tests/compiler/getter-setter.untouched.wat

@@ -3,14 +3,15 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $iv (func (param i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\10\00\00\00g\00e\00t\00t\00e\00r\00-\00s\00e\00t\00t\00e\00r\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $getter-setter/Foo._bar (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 44))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\10\00\00\00g\00e\00t\00t\00e\00r\00-\00s\00e\00t\00t\00e\00r\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $getter-setter/Foo.get:bar (; 1 ;) (type $i) (result i32)
   (get_global $getter-setter/Foo._bar)

tests/compiler/i64-polyfill.optimized.wat

@@ -3,10 +3,13 @@
  (type $iiv (func (param i32 i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $../../examples/i64-polyfill/assembly/i64/lo (mut i32) (i32.const 0))
  (global $../../examples/i64-polyfill/assembly/i64/hi (mut i32) (i32.const 0))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "getHi" (func $../../examples/i64-polyfill/assembly/i64/getHi))
  (export "getLo" (func $../../examples/i64-polyfill/assembly/i64/getLo))
  (export "clz" (func $../../examples/i64-polyfill/assembly/i64/clz))

tests/compiler/i64-polyfill.untouched.wat

@@ -3,15 +3,16 @@
  (type $iiv (func (param i32 i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $../../examples/i64-polyfill/assembly/i64/lo (mut i32) (i32.const 0))
  (global $../../examples/i64-polyfill/assembly/i64/hi (mut i32) (i32.const 0))
  (global $NaN f64 (f64.const nan:0x8000000000000))
  (global $Infinity f64 (f64.const inf))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "getHi" (func $../../examples/i64-polyfill/assembly/i64/getHi))
  (export "getLo" (func $../../examples/i64-polyfill/assembly/i64/getLo))
  (export "clz" (func $../../examples/i64-polyfill/assembly/i64/clz))

tests/compiler/if.optimized.wat

@@ -2,10 +2,13 @@
  (type $ii (func (param i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 8) "\05\00\00\00i\00f\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "ifThenElse" (func $if/ifThenElse))
  (export "ifThen" (func $if/ifThen))
  (export "ifThenElseBlock" (func $if/ifThenElse))

tests/compiler/if.untouched.wat

@@ -2,13 +2,14 @@
  (type $ii (func (param i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $HEAP_BASE i32 (i32.const 24))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\05\00\00\00i\00f\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $HEAP_BASE i32 (i32.const 24))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "ifThenElse" (func $if/ifThenElse))
  (export "ifThen" (func $if/ifThen))
  (export "ifThenElseBlock" (func $if/ifThenElseBlock))

tests/compiler/import.optimized.wat

@@ -2,7 +2,10 @@
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $export/ns.two)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $export/add (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32)
   (i32.const 3)
@@ -14,24 +17,26 @@
   (nop)
  )
  (func $start (; 3 ;) (; has Stack IR ;) (type $v)
+  (local $0 i32)
+  (local $1 i32)
+  (set_local $0
+   (call $export/add)
+  )
+  (set_local $1
+   (call $export/sub)
+  )
   (drop
-   (i32.add
-    (i32.add
-     (call $export/add)
-     (call $export/sub)
-    )
-    (call $export/add)
-   )
+   (call $export/add)
   )
   (call $export/ns.two)
+  (set_local $0
+   (call $export/add)
+  )
+  (set_local $1
+   (call $export/sub)
+  )
   (drop
-   (i32.add
-    (i32.add
-     (call $export/add)
-     (call $export/sub)
-    )
-    (call $export/add)
-   )
+   (call $export/add)
   )
   (call $export/ns.two)
  )

tests/compiler/import.untouched.wat

@@ -1,14 +1,15 @@
 (module
  (type $iii (func (param i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $export/a i32 (i32.const 1))
  (global $export/b i32 (i32.const 2))
  (global $export/c i32 (i32.const 3))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $export/add (; 0 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (i32.add

tests/compiler/infer-type.optimized.wat

@@ -4,13 +4,16 @@
  (type $I (func (result i64)))
  (type $f (func (result f32)))
  (type $F (func (result f64)))
+ (memory $0 1)
+ (data (i32.const 8) "\0d\00\00\00i\00n\00f\00e\00r\00-\00t\00y\00p\00e\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $infer-type/locals)
  (global $infer-type/ri (mut i32) (i32.const 0))
  (global $infer-type/rI (mut i64) (i64.const 0))
  (global $infer-type/rf (mut f32) (f32.const 0))
  (global $infer-type/rF (mut f64) (f64.const 0))
- (memory $0 1)
- (data (i32.const 8) "\0d\00\00\00i\00n\00f\00e\00r\00-\00t\00y\00p\00e\00.\00t\00s")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $infer-type/locals (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)

tests/compiler/infer-type.untouched.wat

@@ -5,6 +5,10 @@
  (type $f (func (result f32)))
  (type $F (func (result f64)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\0d\00\00\00i\00n\00f\00e\00r\00-\00t\00y\00p\00e\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $infer-type/i i32 (i32.const 10))
  (global $infer-type/I i64 (i64.const 4294967296))
@@ -16,11 +20,8 @@
  (global $infer-type/inferi (mut i32) (i32.const -2147483648))
  (global $infer-type/inferu (mut i32) (i32.const 2147483647))
  (global $HEAP_BASE i32 (i32.const 40))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\0d\00\00\00i\00n\00f\00e\00r\00-\00t\00y\00p\00e\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $infer-type/locals (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/inlining-recursive.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "foo" (func $inlining-recursive/foo))
  (export "bar" (func $inlining-recursive/bar))
  (export "baz" (func $inlining-recursive/baz))

tests/compiler/inlining-recursive.untouched.wat

@@ -1,10 +1,11 @@
 (module
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "foo" (func $inlining-recursive/foo))
  (export "bar" (func $inlining-recursive/bar))
  (export "baz" (func $inlining-recursive/baz))

tests/compiler/inlining.optimized.wat

@@ -3,12 +3,12 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (type $ii (func (param i32) (result i32)))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $~argc (mut i32) (i32.const 0))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $inlining/test_funcs~anonymous|1)
  (memory $0 1)
  (data (i32.const 8) "\0b\00\00\00i\00n\00l\00i\00n\00i\00n\00g\00.\00t\00s")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $inlining/test_funcs~anonymous|1)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $~argc (mut i32) (i32.const 0))
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $inlining/test))

tests/compiler/inlining.untouched.wat

@@ -3,14 +3,14 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (type $ii (func (param i32) (result i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\0b\00\00\00i\00n\00l\00i\00n\00i\00n\00g\00.\00t\00s\00")
+ (table 2 anyfunc)
+ (elem (i32.const 0) $null $inlining/test_funcs~anonymous|1)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $inlining/constantGlobal i32 (i32.const 1))
  (global $~argc (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 36))
- (table 2 2 anyfunc)
- (elem (i32.const 0) $null $inlining/test_funcs~anonymous|1)
- (memory $0 1)
- (data (i32.const 8) "\0b\00\00\00i\00n\00l\00i\00n\00i\00n\00g\00.\00t\00s\00")
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "test" (func $inlining/test))

tests/compiler/instanceof.optimized.wat

@@ -2,11 +2,14 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $instanceof/an (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\0d\00\00\00i\00n\00s\00t\00a\00n\00c\00e\00o\00f\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $instanceof/an (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $instanceof/isI32<i32> (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32)
   (i32.const 1)

tests/compiler/instanceof.untouched.wat

@@ -3,6 +3,10 @@
  (type $ii (func (param i32) (result i32)))
  (type $Fi (func (param f64) (result i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\0d\00\00\00i\00n\00s\00t\00a\00n\00c\00e\00o\00f\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $instanceof/a (mut i32) (i32.const 0))
  (global $instanceof/b (mut i32) (i32.const 0))
@@ -10,11 +14,8 @@
  (global $instanceof/f (mut f32) (f32.const 0))
  (global $instanceof/an (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 40))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\0d\00\00\00i\00n\00s\00t\00a\00n\00c\00e\00o\00f\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $instanceof/isI32<i32> (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (return

tests/compiler/limits.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $start)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/limits.untouched.wat

@@ -1,5 +1,8 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $~lib/builtins/i8.MIN_VALUE i32 (i32.const -128))
  (global $~lib/builtins/i8.MAX_VALUE i32 (i32.const 127))
  (global $~lib/builtins/i16.MIN_VALUE i32 (i32.const -32768))
@@ -27,10 +30,8 @@
  (global $~lib/builtins/f64.MIN_SAFE_INTEGER f64 (f64.const -9007199254740991))
  (global $~lib/builtins/f64.MAX_SAFE_INTEGER f64 (f64.const 9007199254740991))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 0 ;) (type $v)
   (drop

tests/compiler/literals.optimized.wat

@@ -1,7 +1,10 @@
 (module
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $start)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/literals.untouched.wat

@@ -1,10 +1,11 @@
 (module
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 0 ;) (type $v)
   (drop

tests/compiler/logical.optimized.wat

@@ -1,14 +1,17 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\n\00\00\00l\00o\00g\00i\00c\00a\00l\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $logical/i (mut i32) (i32.const 0))
  (global $logical/I (mut i64) (i64.const 0))
  (global $logical/f (mut f32) (f32.const 0))
  (global $logical/F (mut f64) (f64.const 0))
- (memory $0 1)
- (data (i32.const 8) "\n\00\00\00l\00o\00g\00i\00c\00a\00l\00.\00t\00s")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (; has Stack IR ;) (type $v)
   (set_global $logical/i

tests/compiler/logical.untouched.wat

@@ -1,17 +1,18 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\n\00\00\00l\00o\00g\00i\00c\00a\00l\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $logical/i (mut i32) (i32.const 0))
  (global $logical/I (mut i64) (i64.const 0))
  (global $logical/f (mut f32) (f32.const 0))
  (global $logical/F (mut f64) (f64.const 0))
  (global $HEAP_BASE i32 (i32.const 32))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\n\00\00\00l\00o\00g\00i\00c\00a\00l\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/main.optimized.wat

@@ -1,10 +1,13 @@
 (module
  (type $iii (func (param i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $main/code (mut i32) (i32.const 0))
  (global $~started (mut i32) (i32.const 0))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "main" (func $main/main))
  (func $main/main (; 0 ;) (; has Stack IR ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if

tests/compiler/main.untouched.wat

@@ -1,13 +1,14 @@
 (module
  (type $iii (func (param i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $main/code (mut i32) (i32.const 0))
  (global $~started (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "main" (func $main/main))
  (func $main/main (; 0 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (if

tests/compiler/mandelbrot.optimized.wat

@@ -5,7 +5,10 @@
  (type $v (func))
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "computeLine" (func $../../examples/mandelbrot/assembly/index/computeLine))
  (func $~lib/math/NativeMath.log (; 0 ;) (; has Stack IR ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i32)
@@ -487,6 +490,55 @@
       (br $repeat|2)
      )
     )
+    (set_local $2
+     (if (result i32)
+      (call $~lib/builtins/isFinite<f64>
+       (tee_local $6
+        (f64.div
+         (call $~lib/math/NativeMath.log
+          (call $~lib/math/NativeMath.log
+           (f64.sqrt
+            (f64.add
+             (f64.mul
+              (get_local $4)
+              (get_local $4)
+             )
+             (f64.mul
+              (get_local $5)
+              (get_local $5)
+             )
+            )
+           )
+          )
+         )
+         (f64.const 0.6931471805599453)
+        )
+       )
+      )
+      (i32.trunc_u/f64
+       (f64.mul
+        (f64.const 2047)
+        (call $../../examples/mandelbrot/assembly/index/clamp<f64>
+         (f64.div
+          (f64.sub
+           (f64.convert_u/i32
+            (i32.add
+             (get_local $2)
+             (i32.const 1)
+            )
+           )
+           (get_local $6)
+          )
+          (f64.convert_u/i32
+           (get_local $3)
+          )
+         )
+        )
+       )
+      )
+      (i32.const 2047)
+     )
+    )
     (i32.store16
      (i32.shl
       (i32.add
@@ -498,55 +550,7 @@
       )
       (i32.const 1)
      )
-     (tee_local $2
-      (if (result i32)
-       (call $~lib/builtins/isFinite<f64>
-        (tee_local $6
-         (f64.div
-          (call $~lib/math/NativeMath.log
-           (call $~lib/math/NativeMath.log
-            (f64.sqrt
-             (f64.add
-              (f64.mul
-               (get_local $4)
-               (get_local $4)
-              )
-              (f64.mul
-               (get_local $5)
-               (get_local $5)
-              )
-             )
-            )
-           )
-          )
-          (f64.const 0.6931471805599453)
-         )
-        )
-       )
-       (i32.trunc_u/f64
-        (f64.mul
-         (f64.const 2047)
-         (call $../../examples/mandelbrot/assembly/index/clamp<f64>
-          (f64.div
-           (f64.sub
-            (f64.convert_u/i32
-             (i32.add
-              (get_local $2)
-              (i32.const 1)
-             )
-            )
-            (get_local $6)
-           )
-           (f64.convert_u/i32
-            (get_local $3)
-           )
-          )
-         )
-        )
-       )
-       (i32.const 2047)
-      )
-     )
+     (get_local $2)
     )
     (set_local $7
      (i32.add

tests/compiler/mandelbrot.untouched.wat

@@ -4,13 +4,14 @@
  (type $Fi (func (param f64) (result i32)))
  (type $FFFF (func (param f64 f64 f64) (result f64)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $../../examples/mandelbrot/assembly/index/NUM_COLORS i32 (i32.const 2048))
  (global $~lib/math/NativeMath.LN2 f64 (f64.const 0.6931471805599453))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "computeLine" (func $../../examples/mandelbrot/assembly/index/computeLine))
  (func $~lib/math/NativeMath.log (; 0 ;) (type $FF) (param $0 f64) (result f64)
   (local $1 i64)

tests/compiler/many-locals.optimized.wat

@@ -2,10 +2,13 @@
  (type $ii (func (param i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (memory $0 1)
  (data (i32.const 8) "\0e\00\00\00m\00a\00n\00y\00-\00l\00o\00c\00a\00l\00s\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "testI32" (func $many-locals/testI32))
  (export "testI8" (func $many-locals/testI8))
  (start $start)

tests/compiler/many-locals.untouched.wat

@@ -2,13 +2,14 @@
  (type $ii (func (param i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $HEAP_BASE i32 (i32.const 40))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\0e\00\00\00m\00a\00n\00y\00-\00l\00o\00c\00a\00l\00s\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $HEAP_BASE i32 (i32.const 40))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "testI32" (func $many-locals/testI32))
  (export "testI8" (func $many-locals/testI8))
  (start $start)

tests/compiler/memcpy.optimized.wat

@@ -2,11 +2,14 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $memcpy/dest (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\t\00\00\00m\00e\00m\00c\00p\00y\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $memcpy/dest (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "memcpy" (func $memcpy/memcpy))
  (start $start)
  (func $memcpy/memcpy (; 1 ;) (; has Stack IR ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)

tests/compiler/memcpy.untouched.wat

@@ -2,15 +2,16 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\t\00\00\00m\00e\00m\00c\00p\00y\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $memcpy/base i32 (i32.const 8))
  (global $memcpy/dest (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 32))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\t\00\00\00m\00e\00m\00c\00p\00y\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "memcpy" (func $memcpy/memcpy))
  (start $start)
  (func $memcpy/memcpy (; 1 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)

tests/compiler/memmove.optimized.wat

@@ -2,11 +2,14 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $memmove/dest (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\n\00\00\00m\00e\00m\00m\00o\00v\00e\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $memmove/dest (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $memmove/memmove (; 1 ;) (; has Stack IR ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)

tests/compiler/memmove.untouched.wat

@@ -2,15 +2,16 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\n\00\00\00m\00e\00m\00m\00o\00v\00e\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $memmove/base i32 (i32.const 8))
  (global $memmove/dest (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 32))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\n\00\00\00m\00e\00m\00m\00o\00v\00e\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $memmove/memmove (; 1 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)

tests/compiler/memset.optimized.wat

@@ -2,11 +2,14 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $memset/dest (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\t\00\00\00m\00e\00m\00s\00e\00t\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $memset/dest (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $memset/memset (; 1 ;) (; has Stack IR ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)

tests/compiler/memset.untouched.wat

@@ -2,14 +2,15 @@
  (type $iiii (func (param i32 i32 i32) (result i32)))
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\t\00\00\00m\00e\00m\00s\00e\00t\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $memset/dest (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 32))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\t\00\00\00m\00e\00m\00s\00e\00t\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $memset/memset (; 1 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
   (local $3 i32)

tests/compiler/named-export-default.optimized.wat

@@ -2,7 +2,10 @@
  (type $i (func (result i32)))
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "default" (func $named-export-default/get3))
  (func $named-export-default/get3 (; 0 ;) (; has Stack IR ;) (type $i) (result i32)
   (i32.const 3)

tests/compiler/named-export-default.untouched.wat

@@ -1,11 +1,12 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "default" (func $named-export-default/get3))
  (func $named-export-default/get3 (; 0 ;) (type $i) (result i32)
   (i32.const 3)

tests/compiler/named-import-default.optimized.wat

@@ -2,7 +2,10 @@
  (type $i (func (result i32)))
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "getValue" (func $named-import-default/getValue))
  (func $named-export-default/get3 (; 0 ;) (; has Stack IR ;) (type $i) (result i32)
   (i32.const 3)

tests/compiler/named-import-default.untouched.wat

@@ -1,11 +1,12 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "getValue" (func $named-import-default/getValue))
  (func $named-export-default/get3 (; 0 ;) (type $i) (result i32)
   (i32.const 3)

tests/compiler/namespace.optimized.wat

@@ -1,9 +1,12 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
- (global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $namespace/Outer.Inner.aFunc (; 0 ;) (; has Stack IR ;) (type $i) (result i32)
   (get_global $namespace/Outer.Inner.aVar)

tests/compiler/namespace.untouched.wat

@@ -1,15 +1,16 @@
 (module
  (type $i (func (result i32)))
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
  (global $namespace/Outer.Inner.anEnum.ONE i32 (i32.const 1))
  (global $namespace/Outer.Inner.anEnum.TWO i32 (i32.const 2))
  (global $namespace/Joined.THREE i32 (i32.const 3))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $namespace/Outer.Inner.aFunc (; 0 ;) (type $i) (result i32)
   (get_global $namespace/Outer.Inner.aVar)

tests/compiler/new-without-allocator.optimized.wat

@@ -3,7 +3,10 @@
  (type $v (func))
  (type $FUNCSIG$i (func (result i32)))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $new-without-allocator/test))
  (func $~lib/memory/memory.allocate (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32)
   (unreachable)

tests/compiler/new-without-allocator.untouched.wat

@@ -2,11 +2,12 @@
  (type $i (func (result i32)))
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
- (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (global $HEAP_BASE i32 (i32.const 8))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "test" (func $new-without-allocator/test))
  (func $~lib/memory/memory.allocate (; 0 ;) (type $ii) (param $0 i32) (result i32)
   (unreachable)

tests/compiler/object-literal.optimized.wat

@@ -5,13 +5,16 @@
  (type $v (func))
  (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
- (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (memory $0 1)
  (data (i32.const 8) "\0b\00\00\00h\00e\00l\00l\00o\00 \00w\00o\00r\00l\00d")
  (data (i32.const 40) "\11\00\00\00o\00b\00j\00e\00c\00t\00-\00l\00i\00t\00e\00r\00a\00l\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
+ (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $~lib/allocator/arena/__memory_allocate (; 1 ;) (; has Stack IR ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)

tests/compiler/object-literal.untouched.wat

@@ -5,6 +5,11 @@
  (type $iii (func (param i32 i32) (result i32)))
  (type $iiiiii (func (param i32 i32 i32 i32 i32) (result i32)))
  (type $v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\0b\00\00\00h\00e\00l\00l\00o\00 \00w\00o\00r\00l\00d\00")
+ (data (i32.const 40) "\11\00\00\00o\00b\00j\00e\00c\00t\00-\00l\00i\00t\00e\00r\00a\00l\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
  (global $~lib/internal/allocator/AL_BITS i32 (i32.const 3))
  (global $~lib/internal/allocator/AL_SIZE i32 (i32.const 8))
@@ -14,12 +19,8 @@
  (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $~lib/internal/string/HEADER_SIZE i32 (i32.const 4))
  (global $HEAP_BASE i32 (i32.const 80))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 1)
- (data (i32.const 8) "\0b\00\00\00h\00e\00l\00l\00o\00 \00w\00o\00r\00l\00d\00")
- (data (i32.const 40) "\11\00\00\00o\00b\00j\00e\00c\00t\00-\00l\00i\00t\00e\00r\00a\00l\00.\00t\00s\00")
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $~lib/allocator/arena/__memory_allocate (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)

tests/compiler/overflow.optimized.wat

@@ -2,7 +2,10 @@
  (type $v (func))
  (memory $0 1)
  (data (i32.const 8) "\0b\00\00\00o\00v\00e\00r\00f\00l\00o\00w\00.\00t\00s")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $start)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (nop)
  )

tests/compiler/overflow.untouched.wat

@@ -1,13 +1,14 @@
 (module
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $v (func))
- (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
- (global $HEAP_BASE i32 (i32.const 36))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
  (memory $0 1)
  (data (i32.const 8) "\0b\00\00\00o\00v\00e\00r\00f\00l\00o\00w\00.\00t\00s\00")
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (global $HEAP_BASE i32 (i32.const 36))
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 1 ;) (type $v)
   (local $0 i32)

tests/compiler/portable-conversions.optimized.wat

@@ -1,9 +1,12 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $portable-conversions/f (mut f32) (f32.const 0))
  (global $portable-conversions/F (mut f64) (f64.const 0))
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 0 ;) (; has Stack IR ;) (type $v)
   (drop

tests/compiler/portable-conversions.untouched.wat

@@ -1,14 +1,15 @@
 (module
  (type $v (func))
+ (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (global $portable-conversions/i (mut i32) (i32.const 0))
  (global $portable-conversions/I (mut i64) (i64.const 0))
  (global $portable-conversions/f (mut f32) (f32.const 0))
  (global $portable-conversions/F (mut f64) (f64.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
- (table 1 1 anyfunc)
- (elem (i32.const 0) $null)
- (memory $0 0)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (start $start)
  (func $start (; 0 ;) (type $v)
   (drop

tests/compiler/recursive.optimized.wat

@@ -2,9 +2,13 @@
  (type $ii (func (param i32) (result i32)))
  (type $v (func))
  (memory $0 0)
+ (table 1 anyfunc)
+ (elem (i32.const 0) $null)
  (export "memory" (memory $0))
+ (export "table" (table $0))
  (export "fib" (func $recursive/fib))
  (func $recursive/fib (; 0 ;) (; has Stack IR ;) (type $ii) (param $0 i32) (result i32)
+  (local $1 i32)
   (if
    (i32.le_s
     (get_local $0)
@@ -14,13 +18,15 @@
     (i32.const 1)
    )
   )
-  (i32.add
+  (set_local $1
    (call $recursive/fib
     (i32.sub
      (get_local $0)
      (i32.const 1)
     )
    )
+  )
+  (set_local $0
    (call $recursive/fib
     (i32.sub
      (get_local $0)
@@ -28,6 +34,10 @@
     )
    )
   )
+  (i32.add
+   (get_local $1)
+   (get_local $0)
+  )
  )
  (func $null (; 1 ;) (; has Stack IR ;) (type $v)
   (nop)