From 50c49e427532b914af9a2ed0af97bb1e7928c543 Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Wed, 3 Apr 2019 00:26:41 +0200
Subject: [PATCH] make it 'runtime.instanceof'

---
 src/tokenizer.ts                              |  1 +
 std/assembly/runtime.ts                       | 27 ++++----
 tests/compiler/call-super.optimized.wat       |  4 +-
 tests/compiler/call-super.untouched.wat       |  4 +-
 tests/compiler/constructor.optimized.wat      |  4 +-
 tests/compiler/constructor.untouched.wat      |  4 +-
 tests/compiler/exports.optimized.wat          |  4 +-
 tests/compiler/exports.untouched.wat          |  4 +-
 tests/compiler/gc.optimized.wat               | 48 +++++++-------
 tests/compiler/gc.untouched.wat               | 63 ++++++++++---------
 tests/compiler/gc/global-assign.optimized.wat |  4 +-
 tests/compiler/gc/global-assign.untouched.wat |  4 +-
 tests/compiler/gc/global-init.optimized.wat   |  4 +-
 tests/compiler/gc/global-init.untouched.wat   |  4 +-
 tests/compiler/gc/itcm/trace.optimized.wat    |  6 +-
 tests/compiler/gc/itcm/trace.untouched.wat    |  6 +-
 .../gc/rc/global-assign.optimized.wat         |  4 +-
 .../gc/rc/global-assign.untouched.wat         |  4 +-
 .../compiler/gc/rc/global-init.optimized.wat  |  4 +-
 .../compiler/gc/rc/global-init.untouched.wat  |  4 +-
 tests/compiler/getter-call.optimized.wat      |  4 +-
 tests/compiler/getter-call.untouched.wat      |  4 +-
 tests/compiler/inlining.optimized.wat         |  4 +-
 tests/compiler/inlining.untouched.wat         |  4 +-
 tests/compiler/number.optimized.wat           |  8 +--
 tests/compiler/number.untouched.wat           |  8 +--
 .../optional-typeparameters.optimized.wat     |  4 +-
 .../optional-typeparameters.untouched.wat     |  4 +-
 .../compiler/runtime/instanceof.optimized.wat |  4 +-
 .../compiler/runtime/instanceof.untouched.wat |  4 +-
 .../compiler/std/array-literal.optimized.wat  |  4 +-
 .../compiler/std/array-literal.untouched.wat  |  4 +-
 tests/compiler/std/array.optimized.wat        | 10 +--
 tests/compiler/std/array.untouched.wat        | 10 +--
 tests/compiler/std/arraybuffer.optimized.wat  |  4 +-
 tests/compiler/std/arraybuffer.untouched.wat  |  4 +-
 tests/compiler/std/dataview.optimized.wat     |  4 +-
 tests/compiler/std/dataview.untouched.wat     |  4 +-
 tests/compiler/std/date.optimized.wat         |  4 +-
 tests/compiler/std/date.untouched.wat         |  4 +-
 tests/compiler/std/map.optimized.wat          |  4 +-
 tests/compiler/std/map.untouched.wat          |  4 +-
 tests/compiler/std/new.optimized.wat          |  4 +-
 tests/compiler/std/new.untouched.wat          |  4 +-
 .../compiler/std/object-literal.optimized.wat |  4 +-
 .../compiler/std/object-literal.untouched.wat |  4 +-
 .../std/operator-overloading.optimized.wat    |  4 +-
 .../std/operator-overloading.untouched.wat    |  4 +-
 tests/compiler/std/runtime.optimized.wat      | 10 +--
 tests/compiler/std/runtime.untouched.wat      | 10 +--
 tests/compiler/std/set.optimized.wat          |  4 +-
 tests/compiler/std/set.untouched.wat          |  4 +-
 tests/compiler/std/static-array.optimized.wat |  2 +-
 tests/compiler/std/static-array.untouched.wat |  2 +-
 tests/compiler/std/string-utf8.optimized.wat  |  4 +-
 tests/compiler/std/string-utf8.untouched.wat  |  4 +-
 tests/compiler/std/string.optimized.wat       | 10 +--
 tests/compiler/std/string.untouched.wat       | 10 +--
 tests/compiler/std/symbol.optimized.wat       |  4 +-
 tests/compiler/std/symbol.untouched.wat       |  4 +-
 tests/compiler/std/typedarray.optimized.wat   |  4 +-
 tests/compiler/std/typedarray.untouched.wat   |  4 +-
 62 files changed, 212 insertions(+), 203 deletions(-)

diff --git a/src/tokenizer.ts b/src/tokenizer.ts
index 75088508..8076d5ad 100644
--- a/src/tokenizer.ts
+++ b/src/tokenizer.ts
@@ -350,6 +350,7 @@ export function tokenIsAlsoIdentifier(token: Token): bool {
     case Token.FROM:
     case Token.FOR:
     case Token.GET:
+    case Token.INSTANCEOF:
     case Token.IS:
     case Token.KEYOF:
     case Token.MODULE:
diff --git a/std/assembly/runtime.ts b/std/assembly/runtime.ts
index 0d167a78..09b3e8cf 100644
--- a/std/assembly/runtime.ts
+++ b/std/assembly/runtime.ts
@@ -15,6 +15,22 @@ export declare function __runtime_id<T>(): u32;
 @unsafe @builtin
 export declare function __runtime_instanceof(id: u32, superId: u32): bool;
 
+/** Runtime implementation. */
+@unmanaged
+export class runtime {
+  private constructor() { return unreachable(); }
+
+  @unsafe
+  static instanceof(ref: usize, id: u32): bool { // keyword
+    return ref
+      ? __runtime_instanceof(
+          changetype<HEADER>(ref - HEADER_SIZE).classId,
+          id
+        )
+      : false;
+  }
+}
+
 /** Runtime implementation. */
 export namespace runtime {
 
@@ -128,15 +144,4 @@ export namespace runtime {
     if (source) memory.copy(buffer, source, bufferSize);
     return array;
   }
-
-  // @ts-ignore: decorator
-  @unsafe
-  export function instanceOf(ref: usize, id: u32): bool {
-    return ref
-      ? __runtime_instanceof(
-          changetype<HEADER>(ref - HEADER_SIZE).classId,
-          id
-        )
-      : false;
-  }
 }
diff --git a/tests/compiler/call-super.optimized.wat b/tests/compiler/call-super.optimized.wat
index 0b64d237..d681e6e2 100644
--- a/tests/compiler/call-super.optimized.wat
+++ b/tests/compiler/call-super.optimized.wat
@@ -106,7 +106,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -121,7 +121,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/call-super.untouched.wat b/tests/compiler/call-super.untouched.wat
index 3c731b05..b7f7c1cf 100644
--- a/tests/compiler/call-super.untouched.wat
+++ b/tests/compiler/call-super.untouched.wat
@@ -139,7 +139,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -156,7 +156,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/constructor.optimized.wat b/tests/compiler/constructor.optimized.wat
index c2fc78b3..1aa1c7c2 100644
--- a/tests/compiler/constructor.optimized.wat
+++ b/tests/compiler/constructor.optimized.wat
@@ -1283,7 +1283,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1298,7 +1298,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/constructor.untouched.wat b/tests/compiler/constructor.untouched.wat
index 625eee92..3a430f25 100644
--- a/tests/compiler/constructor.untouched.wat
+++ b/tests/compiler/constructor.untouched.wat
@@ -1563,7 +1563,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1580,7 +1580,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/exports.optimized.wat b/tests/compiler/exports.optimized.wat
index a1374ad9..f7376270 100644
--- a/tests/compiler/exports.optimized.wat
+++ b/tests/compiler/exports.optimized.wat
@@ -146,7 +146,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -161,7 +161,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/exports.untouched.wat b/tests/compiler/exports.untouched.wat
index 46ea1b49..31dc552f 100644
--- a/tests/compiler/exports.untouched.wat
+++ b/tests/compiler/exports.untouched.wat
@@ -192,7 +192,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -209,7 +209,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc.optimized.wat b/tests/compiler/gc.optimized.wat
index 959e4bd0..2f247508 100644
--- a/tests/compiler/gc.optimized.wat
+++ b/tests/compiler/gc.optimized.wat
@@ -48,6 +48,7 @@
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "main" (func $gc/main))
+ (export "runtime.instanceof" (func $~lib/runtime/runtime.instanceof))
  (export "runtime.adjust" (func $~lib/runtime/runtime.adjust))
  (export "runtime.allocate" (func $~lib/runtime/runtime.allocate))
  (export "runtime.reallocate" (func $~lib/runtime/runtime.reallocate))
@@ -55,7 +56,6 @@
  (export "runtime.register" (func $~lib/runtime/runtime.register))
  (export ".setargc" (func $~lib/setargc))
  (export "runtime.makeArray" (func $~lib/runtime/runtime.makeArray|trampoline))
- (export "runtime.instanceOf" (func $~lib/runtime/runtime.instanceOf))
  (export "gc.implemented" (global $~lib/gc/gc.implemented))
  (export "gc.collect" (func $~lib/gc/gc.collect))
  (export "gc.retain" (func $~lib/gc/gc.retain))
@@ -185,7 +185,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -200,7 +200,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1133,7 +1133,20 @@
    unreachable
   end
  )
- (func $~lib/util/memory/memcpy (; 23 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/runtime/runtime.instanceof (; 23 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  if (result i32)
+   local.get $0
+   i32.const 16
+   i32.sub
+   i32.load
+   local.get $1
+   call $~lib/runtime/__runtime_instanceof
+  else   
+   i32.const 0
+  end
+ )
+ (func $~lib/util/memory/memcpy (; 24 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -1980,7 +1993,7 @@
    i32.store8
   end
  )
- (func $~lib/memory/memory.copy (; 24 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/memory.copy (; 25 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   block $~lib/util/memory/memmove|inlined.0
@@ -2174,7 +2187,7 @@
    end
   end
  )
- (func $~lib/runtime/runtime.reallocate (; 25 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/runtime/runtime.reallocate (; 26 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2251,7 +2264,7 @@
      if
       i32.const 0
       i32.const 24
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -2279,14 +2292,14 @@
   i32.store offset=4
   local.get $0
  )
- (func $~lib/runtime/runtime.discard (; 26 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/runtime/runtime.discard (; 27 ;) (type $FUNCSIG$vi) (param $0 i32)
   local.get $0
   i32.const 292
   i32.le_u
   if
    i32.const 0
    i32.const 24
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2300,13 +2313,13 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
   end
  )
- (func $~lib/runtime/runtime.makeArray (; 27 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/runtime/runtime.makeArray (; 28 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -2362,19 +2375,6 @@
   end
   local.get $4
  )
- (func $~lib/runtime/runtime.instanceOf (; 28 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
-  local.get $0
-  if (result i32)
-   local.get $0
-   i32.const 16
-   i32.sub
-   i32.load
-   local.get $1
-   call $~lib/runtime/__runtime_instanceof
-  else   
-   i32.const 0
-  end
- )
  (func $~lib/runtime/__runtime_instanceof (; 29 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
   block $nope
    block $~lib/arraybuffer/ArrayBuffer
diff --git a/tests/compiler/gc.untouched.wat b/tests/compiler/gc.untouched.wat
index 77b3114a..e3cff7fc 100644
--- a/tests/compiler/gc.untouched.wat
+++ b/tests/compiler/gc.untouched.wat
@@ -47,6 +47,7 @@
  (export "memory" (memory $0))
  (export "table" (table $0))
  (export "main" (func $gc/main))
+ (export "runtime.instanceof" (func $~lib/runtime/runtime.instanceof))
  (export "runtime.adjust" (func $~lib/runtime/runtime.adjust))
  (export "runtime.allocate" (func $~lib/runtime/runtime.allocate))
  (export "runtime.reallocate" (func $~lib/runtime/runtime.reallocate))
@@ -54,7 +55,6 @@
  (export "runtime.register" (func $~lib/runtime/runtime.register))
  (export ".setargc" (func $~lib/setargc))
  (export "runtime.makeArray" (func $~lib/runtime/runtime.makeArray|trampoline))
- (export "runtime.instanceOf" (func $~lib/runtime/runtime.instanceOf))
  (export "gc.implemented" (global $~lib/gc/gc.implemented))
  (export "gc.collect" (func $~lib/gc/gc.collect))
  (export "gc.retain" (func $~lib/gc/gc.retain))
@@ -204,7 +204,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -221,7 +221,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1332,7 +1332,20 @@
    unreachable
   end
  )
- (func $~lib/util/memory/memcpy (; 26 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/runtime/runtime.instanceof (; 26 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  if (result i32)
+   local.get $0
+   global.get $~lib/util/runtime/HEADER_SIZE
+   i32.sub
+   i32.load
+   local.get $1
+   call $~lib/runtime/__runtime_instanceof
+  else   
+   i32.const 0
+  end
+ )
+ (func $~lib/util/memory/memcpy (; 27 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2533,7 +2546,7 @@
    i32.store8
   end
  )
- (func $~lib/memory/memory.copy (; 27 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/memory.copy (; 28 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
   (local $5 i32)
@@ -2764,14 +2777,14 @@
    end
   end
  )
- (func $~lib/allocator/arena/__mem_free (; 28 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/allocator/arena/__mem_free (; 29 ;) (type $FUNCSIG$vi) (param $0 i32)
   nop
  )
- (func $~lib/memory/memory.free (; 29 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/memory/memory.free (; 30 ;) (type $FUNCSIG$vi) (param $0 i32)
   local.get $0
   call $~lib/allocator/arena/__mem_free
  )
- (func $~lib/runtime/runtime.reallocate (; 30 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/runtime/runtime.reallocate (; 31 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -2842,7 +2855,7 @@
      if
       i32.const 0
       i32.const 24
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -2875,7 +2888,7 @@
   i32.store offset=4
   local.get $0
  )
- (func $~lib/runtime/runtime.discard (; 31 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/runtime/runtime.discard (; 32 ;) (type $FUNCSIG$vi) (param $0 i32)
   (local $1 i32)
   local.get $0
   global.get $~lib/memory/HEAP_BASE
@@ -2884,7 +2897,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2901,7 +2914,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2909,7 +2922,7 @@
   local.get $1
   call $~lib/memory/memory.free
  )
- (func $~lib/runtime/runtime.makeArray (; 32 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/runtime/runtime.makeArray (; 33 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
@@ -2973,20 +2986,10 @@
   end
   local.get $4
  )
- (func $~lib/runtime/runtime.instanceOf (; 33 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
-  local.get $0
-  if (result i32)
-   local.get $0
-   global.get $~lib/util/runtime/HEADER_SIZE
-   i32.sub
-   i32.load
-   local.get $1
-   call $~lib/runtime/__runtime_instanceof
-  else   
-   i32.const 0
-  end
+ (func $~lib/runtime/runtime#constructor (; 34 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  unreachable
  )
- (func $start (; 34 ;) (type $FUNCSIG$v)
+ (func $start (; 35 ;) (type $FUNCSIG$v)
   global.get $~lib/memory/HEAP_BASE
   i32.const 7
   i32.add
@@ -3001,7 +3004,7 @@
   call $~lib/set/Set<usize>#constructor
   global.set $~lib/gc/ROOT
  )
- (func $~lib/runtime/__runtime_instanceof (; 35 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/runtime/__runtime_instanceof (; 36 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
   block $nope
    block $~lib/arraybuffer/ArrayBuffer
     block $~lib/set/Set<usize>
@@ -3033,9 +3036,9 @@
   i32.const 0
   return
  )
- (func $null (; 36 ;) (type $FUNCSIG$v)
+ (func $null (; 37 ;) (type $FUNCSIG$v)
  )
- (func $~lib/runtime/runtime.makeArray|trampoline (; 37 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+ (func $~lib/runtime/runtime.makeArray|trampoline (; 38 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   block $1of1
    block $0of1
     block $outOfRange
@@ -3055,7 +3058,7 @@
   local.get $3
   call $~lib/runtime/runtime.makeArray
  )
- (func $~lib/setargc (; 38 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/setargc (; 39 ;) (type $FUNCSIG$vi) (param $0 i32)
   local.get $0
   global.set $~lib/argc
  )
diff --git a/tests/compiler/gc/global-assign.optimized.wat b/tests/compiler/gc/global-assign.optimized.wat
index 27618b5a..a94da9a9 100644
--- a/tests/compiler/gc/global-assign.optimized.wat
+++ b/tests/compiler/gc/global-assign.optimized.wat
@@ -137,7 +137,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -152,7 +152,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/global-assign.untouched.wat b/tests/compiler/gc/global-assign.untouched.wat
index 6c22ff95..8440abb0 100644
--- a/tests/compiler/gc/global-assign.untouched.wat
+++ b/tests/compiler/gc/global-assign.untouched.wat
@@ -182,7 +182,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -199,7 +199,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/global-init.optimized.wat b/tests/compiler/gc/global-init.optimized.wat
index e030d7d8..ffe8da48 100644
--- a/tests/compiler/gc/global-init.optimized.wat
+++ b/tests/compiler/gc/global-init.optimized.wat
@@ -136,7 +136,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -151,7 +151,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/global-init.untouched.wat b/tests/compiler/gc/global-init.untouched.wat
index d48ee91e..bf5fa6c0 100644
--- a/tests/compiler/gc/global-init.untouched.wat
+++ b/tests/compiler/gc/global-init.untouched.wat
@@ -181,7 +181,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -198,7 +198,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/itcm/trace.optimized.wat b/tests/compiler/gc/itcm/trace.optimized.wat
index 872384f2..c8208fe6 100644
--- a/tests/compiler/gc/itcm/trace.optimized.wat
+++ b/tests/compiler/gc/itcm/trace.optimized.wat
@@ -341,7 +341,7 @@
   if
    i32.const 0
    i32.const 128
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -356,7 +356,7 @@
   if
    i32.const 0
    i32.const 128
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1859,7 +1859,7 @@
      if
       i32.const 0
       i32.const 128
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
diff --git a/tests/compiler/gc/itcm/trace.untouched.wat b/tests/compiler/gc/itcm/trace.untouched.wat
index 5bf72e9b..8cdb20ef 100644
--- a/tests/compiler/gc/itcm/trace.untouched.wat
+++ b/tests/compiler/gc/itcm/trace.untouched.wat
@@ -390,7 +390,7 @@
   if
    i32.const 0
    i32.const 128
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -407,7 +407,7 @@
   if
    i32.const 0
    i32.const 128
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2466,7 +2466,7 @@
      if
       i32.const 0
       i32.const 128
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
diff --git a/tests/compiler/gc/rc/global-assign.optimized.wat b/tests/compiler/gc/rc/global-assign.optimized.wat
index 2a87c612..22353b47 100644
--- a/tests/compiler/gc/rc/global-assign.optimized.wat
+++ b/tests/compiler/gc/rc/global-assign.optimized.wat
@@ -143,7 +143,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -158,7 +158,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/rc/global-assign.untouched.wat b/tests/compiler/gc/rc/global-assign.untouched.wat
index f704186e..960f9e08 100644
--- a/tests/compiler/gc/rc/global-assign.untouched.wat
+++ b/tests/compiler/gc/rc/global-assign.untouched.wat
@@ -180,7 +180,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -197,7 +197,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/rc/global-init.optimized.wat b/tests/compiler/gc/rc/global-init.optimized.wat
index 48415596..f522db6f 100644
--- a/tests/compiler/gc/rc/global-init.optimized.wat
+++ b/tests/compiler/gc/rc/global-init.optimized.wat
@@ -139,7 +139,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -154,7 +154,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/gc/rc/global-init.untouched.wat b/tests/compiler/gc/rc/global-init.untouched.wat
index 9bf25602..2215cd0f 100644
--- a/tests/compiler/gc/rc/global-init.untouched.wat
+++ b/tests/compiler/gc/rc/global-init.untouched.wat
@@ -178,7 +178,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -195,7 +195,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/getter-call.optimized.wat b/tests/compiler/getter-call.optimized.wat
index 891e19ed..56b9ede9 100644
--- a/tests/compiler/getter-call.optimized.wat
+++ b/tests/compiler/getter-call.optimized.wat
@@ -85,7 +85,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -100,7 +100,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/getter-call.untouched.wat b/tests/compiler/getter-call.untouched.wat
index f0b0fc02..d56f743a 100644
--- a/tests/compiler/getter-call.untouched.wat
+++ b/tests/compiler/getter-call.untouched.wat
@@ -141,7 +141,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -158,7 +158,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/inlining.optimized.wat b/tests/compiler/inlining.optimized.wat
index b67dcff3..b3a3e14c 100644
--- a/tests/compiler/inlining.optimized.wat
+++ b/tests/compiler/inlining.optimized.wat
@@ -131,7 +131,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -146,7 +146,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/inlining.untouched.wat b/tests/compiler/inlining.untouched.wat
index 40a2ec4e..1803bad4 100644
--- a/tests/compiler/inlining.untouched.wat
+++ b/tests/compiler/inlining.untouched.wat
@@ -405,7 +405,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -422,7 +422,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/number.optimized.wat b/tests/compiler/number.optimized.wat
index 23bf9184..6da86e17 100644
--- a/tests/compiler/number.optimized.wat
+++ b/tests/compiler/number.optimized.wat
@@ -303,7 +303,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -318,7 +318,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2451,7 +2451,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2465,7 +2465,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/number.untouched.wat b/tests/compiler/number.untouched.wat
index 792bee7b..058ac0ff 100644
--- a/tests/compiler/number.untouched.wat
+++ b/tests/compiler/number.untouched.wat
@@ -399,7 +399,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -416,7 +416,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3534,7 +3534,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3551,7 +3551,7 @@
   if
    i32.const 0
    i32.const 464
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/optional-typeparameters.optimized.wat b/tests/compiler/optional-typeparameters.optimized.wat
index 80fb2f3c..3a7909e2 100644
--- a/tests/compiler/optional-typeparameters.optimized.wat
+++ b/tests/compiler/optional-typeparameters.optimized.wat
@@ -100,7 +100,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -115,7 +115,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/optional-typeparameters.untouched.wat b/tests/compiler/optional-typeparameters.untouched.wat
index ea2f4ea8..1ca1bb2b 100644
--- a/tests/compiler/optional-typeparameters.untouched.wat
+++ b/tests/compiler/optional-typeparameters.untouched.wat
@@ -148,7 +148,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -165,7 +165,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/runtime/instanceof.optimized.wat b/tests/compiler/runtime/instanceof.optimized.wat
index fe71599a..138d08b8 100644
--- a/tests/compiler/runtime/instanceof.optimized.wat
+++ b/tests/compiler/runtime/instanceof.optimized.wat
@@ -143,7 +143,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -158,7 +158,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/runtime/instanceof.untouched.wat b/tests/compiler/runtime/instanceof.untouched.wat
index f8e4faad..d0f4fbdb 100644
--- a/tests/compiler/runtime/instanceof.untouched.wat
+++ b/tests/compiler/runtime/instanceof.untouched.wat
@@ -189,7 +189,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -206,7 +206,7 @@
   if
    i32.const 0
    i32.const 88
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/array-literal.optimized.wat b/tests/compiler/std/array-literal.optimized.wat
index a646be8b..c2acc830 100644
--- a/tests/compiler/std/array-literal.optimized.wat
+++ b/tests/compiler/std/array-literal.optimized.wat
@@ -177,7 +177,7 @@
   if
    i32.const 0
    i32.const 296
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -192,7 +192,7 @@
   if
    i32.const 0
    i32.const 296
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/array-literal.untouched.wat b/tests/compiler/std/array-literal.untouched.wat
index 414c8d2a..37e040cf 100644
--- a/tests/compiler/std/array-literal.untouched.wat
+++ b/tests/compiler/std/array-literal.untouched.wat
@@ -233,7 +233,7 @@
   if
    i32.const 0
    i32.const 296
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -250,7 +250,7 @@
   if
    i32.const 0
    i32.const 296
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/array.optimized.wat b/tests/compiler/std/array.optimized.wat
index f8cc1348..6ce4211e 100644
--- a/tests/compiler/std/array.optimized.wat
+++ b/tests/compiler/std/array.optimized.wat
@@ -787,7 +787,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -802,7 +802,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2340,7 +2340,7 @@
      if
       i32.const 0
       i32.const 80
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -6323,7 +6323,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -6337,7 +6337,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/array.untouched.wat b/tests/compiler/std/array.untouched.wat
index c2a9e471..06e87096 100644
--- a/tests/compiler/std/array.untouched.wat
+++ b/tests/compiler/std/array.untouched.wat
@@ -684,7 +684,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -701,7 +701,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2859,7 +2859,7 @@
      if
       i32.const 0
       i32.const 80
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -9604,7 +9604,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -9621,7 +9621,7 @@
   if
    i32.const 0
    i32.const 80
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/arraybuffer.optimized.wat b/tests/compiler/std/arraybuffer.optimized.wat
index 0ca4ccf8..003898b7 100644
--- a/tests/compiler/std/arraybuffer.optimized.wat
+++ b/tests/compiler/std/arraybuffer.optimized.wat
@@ -327,7 +327,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -342,7 +342,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/arraybuffer.untouched.wat b/tests/compiler/std/arraybuffer.untouched.wat
index 2951878a..263760de 100644
--- a/tests/compiler/std/arraybuffer.untouched.wat
+++ b/tests/compiler/std/arraybuffer.untouched.wat
@@ -407,7 +407,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -424,7 +424,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/dataview.optimized.wat b/tests/compiler/std/dataview.optimized.wat
index a194761b..25724f18 100644
--- a/tests/compiler/std/dataview.optimized.wat
+++ b/tests/compiler/std/dataview.optimized.wat
@@ -165,7 +165,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -180,7 +180,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/dataview.untouched.wat b/tests/compiler/std/dataview.untouched.wat
index ad420ca8..cd1db6b2 100644
--- a/tests/compiler/std/dataview.untouched.wat
+++ b/tests/compiler/std/dataview.untouched.wat
@@ -413,7 +413,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -430,7 +430,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/date.optimized.wat b/tests/compiler/std/date.optimized.wat
index 6c655d30..116af7fe 100644
--- a/tests/compiler/std/date.optimized.wat
+++ b/tests/compiler/std/date.optimized.wat
@@ -89,7 +89,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -104,7 +104,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/date.untouched.wat b/tests/compiler/std/date.untouched.wat
index 67b2f1f7..44257c38 100644
--- a/tests/compiler/std/date.untouched.wat
+++ b/tests/compiler/std/date.untouched.wat
@@ -148,7 +148,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -165,7 +165,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/map.optimized.wat b/tests/compiler/std/map.optimized.wat
index 04d1628d..40217a4d 100644
--- a/tests/compiler/std/map.optimized.wat
+++ b/tests/compiler/std/map.optimized.wat
@@ -135,7 +135,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -150,7 +150,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/map.untouched.wat b/tests/compiler/std/map.untouched.wat
index bfb23208..b103b77c 100644
--- a/tests/compiler/std/map.untouched.wat
+++ b/tests/compiler/std/map.untouched.wat
@@ -166,7 +166,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -183,7 +183,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/new.optimized.wat b/tests/compiler/std/new.optimized.wat
index 65a4c2f1..9d1e7808 100644
--- a/tests/compiler/std/new.optimized.wat
+++ b/tests/compiler/std/new.optimized.wat
@@ -84,7 +84,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -99,7 +99,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/new.untouched.wat b/tests/compiler/std/new.untouched.wat
index 3f797389..37689c95 100644
--- a/tests/compiler/std/new.untouched.wat
+++ b/tests/compiler/std/new.untouched.wat
@@ -141,7 +141,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -158,7 +158,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/object-literal.optimized.wat b/tests/compiler/std/object-literal.optimized.wat
index 0a163f0d..bdb62aad 100644
--- a/tests/compiler/std/object-literal.optimized.wat
+++ b/tests/compiler/std/object-literal.optimized.wat
@@ -118,7 +118,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -133,7 +133,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/object-literal.untouched.wat b/tests/compiler/std/object-literal.untouched.wat
index c1224708..11eb9ba4 100644
--- a/tests/compiler/std/object-literal.untouched.wat
+++ b/tests/compiler/std/object-literal.untouched.wat
@@ -153,7 +153,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -170,7 +170,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/operator-overloading.optimized.wat b/tests/compiler/std/operator-overloading.optimized.wat
index a23ab054..06e9f5d7 100644
--- a/tests/compiler/std/operator-overloading.optimized.wat
+++ b/tests/compiler/std/operator-overloading.optimized.wat
@@ -167,7 +167,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -182,7 +182,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/operator-overloading.untouched.wat b/tests/compiler/std/operator-overloading.untouched.wat
index 58f6db40..287acddd 100644
--- a/tests/compiler/std/operator-overloading.untouched.wat
+++ b/tests/compiler/std/operator-overloading.untouched.wat
@@ -209,7 +209,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -226,7 +226,7 @@
   if
    i32.const 0
    i32.const 16
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/runtime.optimized.wat b/tests/compiler/std/runtime.optimized.wat
index 7f225581..29b95e4e 100644
--- a/tests/compiler/std/runtime.optimized.wat
+++ b/tests/compiler/std/runtime.optimized.wat
@@ -2560,7 +2560,7 @@
      if
       i32.const 0
       i32.const 232
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -2597,7 +2597,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2612,7 +2612,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2628,7 +2628,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -2643,7 +2643,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/runtime.untouched.wat b/tests/compiler/std/runtime.untouched.wat
index 0bbaf534..15a904e7 100644
--- a/tests/compiler/std/runtime.untouched.wat
+++ b/tests/compiler/std/runtime.untouched.wat
@@ -3288,7 +3288,7 @@
      if
       i32.const 0
       i32.const 232
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -3330,7 +3330,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3347,7 +3347,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3364,7 +3364,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3381,7 +3381,7 @@
   if
    i32.const 0
    i32.const 232
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/set.optimized.wat b/tests/compiler/std/set.optimized.wat
index 64fbf743..1e8d43f0 100644
--- a/tests/compiler/std/set.optimized.wat
+++ b/tests/compiler/std/set.optimized.wat
@@ -131,7 +131,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -146,7 +146,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/set.untouched.wat b/tests/compiler/std/set.untouched.wat
index 7eba4061..ac8c6708 100644
--- a/tests/compiler/std/set.untouched.wat
+++ b/tests/compiler/std/set.untouched.wat
@@ -166,7 +166,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -183,7 +183,7 @@
   if
    i32.const 0
    i32.const 24
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/static-array.optimized.wat b/tests/compiler/std/static-array.optimized.wat
index 39a7e425..37b088cc 100644
--- a/tests/compiler/std/static-array.optimized.wat
+++ b/tests/compiler/std/static-array.optimized.wat
@@ -1437,7 +1437,7 @@
      if
       i32.const 0
       i32.const 280
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
diff --git a/tests/compiler/std/static-array.untouched.wat b/tests/compiler/std/static-array.untouched.wat
index 6714c00c..c57c7254 100644
--- a/tests/compiler/std/static-array.untouched.wat
+++ b/tests/compiler/std/static-array.untouched.wat
@@ -1928,7 +1928,7 @@
      if
       i32.const 0
       i32.const 280
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
diff --git a/tests/compiler/std/string-utf8.optimized.wat b/tests/compiler/std/string-utf8.optimized.wat
index bddf32e4..f1dd5e16 100644
--- a/tests/compiler/std/string-utf8.optimized.wat
+++ b/tests/compiler/std/string-utf8.optimized.wat
@@ -1464,7 +1464,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1479,7 +1479,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/string-utf8.untouched.wat b/tests/compiler/std/string-utf8.untouched.wat
index 6e4071eb..a9fca170 100644
--- a/tests/compiler/std/string-utf8.untouched.wat
+++ b/tests/compiler/std/string-utf8.untouched.wat
@@ -1929,7 +1929,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -1946,7 +1946,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/string.optimized.wat b/tests/compiler/std/string.optimized.wat
index 6700b06b..350e4bce 100644
--- a/tests/compiler/std/string.optimized.wat
+++ b/tests/compiler/std/string.optimized.wat
@@ -444,7 +444,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -459,7 +459,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3235,7 +3235,7 @@
      if
       i32.const 0
       i32.const 184
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -5177,7 +5177,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -5191,7 +5191,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/string.untouched.wat b/tests/compiler/std/string.untouched.wat
index 3a1416c1..e9c94dc2 100644
--- a/tests/compiler/std/string.untouched.wat
+++ b/tests/compiler/std/string.untouched.wat
@@ -379,7 +379,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -396,7 +396,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -3850,7 +3850,7 @@
      if
       i32.const 0
       i32.const 184
-      i32.const 69
+      i32.const 85
       i32.const 10
       call $~lib/env/abort
       unreachable
@@ -6549,7 +6549,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 94
+   i32.const 110
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -6566,7 +6566,7 @@
   if
    i32.const 0
    i32.const 184
-   i32.const 96
+   i32.const 112
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/symbol.optimized.wat b/tests/compiler/std/symbol.optimized.wat
index b9654c31..0b2c17e8 100644
--- a/tests/compiler/std/symbol.optimized.wat
+++ b/tests/compiler/std/symbol.optimized.wat
@@ -144,7 +144,7 @@
   if
    i32.const 0
    i32.const 72
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -159,7 +159,7 @@
   if
    i32.const 0
    i32.const 72
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/symbol.untouched.wat b/tests/compiler/std/symbol.untouched.wat
index 410fbd1c..a00be986 100644
--- a/tests/compiler/std/symbol.untouched.wat
+++ b/tests/compiler/std/symbol.untouched.wat
@@ -200,7 +200,7 @@
   if
    i32.const 0
    i32.const 72
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -217,7 +217,7 @@
   if
    i32.const 0
    i32.const 72
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/typedarray.optimized.wat b/tests/compiler/std/typedarray.optimized.wat
index 00e74641..0991f7ee 100644
--- a/tests/compiler/std/typedarray.optimized.wat
+++ b/tests/compiler/std/typedarray.optimized.wat
@@ -439,7 +439,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -454,7 +454,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable
diff --git a/tests/compiler/std/typedarray.untouched.wat b/tests/compiler/std/typedarray.untouched.wat
index a20d42bd..31eca951 100644
--- a/tests/compiler/std/typedarray.untouched.wat
+++ b/tests/compiler/std/typedarray.untouched.wat
@@ -497,7 +497,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 107
+   i32.const 123
    i32.const 6
    call $~lib/env/abort
    unreachable
@@ -514,7 +514,7 @@
   if
    i32.const 0
    i32.const 136
-   i32.const 109
+   i32.const 125
    i32.const 6
    call $~lib/env/abort
    unreachable