From a699ca4d4c1c2c1edfa6414a1d63682274d350bb Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Tue, 10 Mar 2020 06:31:26 +0100
Subject: [PATCH] Use base index signature if inherited

---
 src/resolver.ts                               |   3 +-
 .../resolve-elementaccess.optimized.wat       | 466 +++++++++++++++---
 tests/compiler/resolve-elementaccess.ts       |  24 +
 .../resolve-elementaccess.untouched.wat       | 237 ++++++++-
 4 files changed, 665 insertions(+), 65 deletions(-)

diff --git a/src/resolver.ts b/src/resolver.ts
index b637202ed0..7084d50493 100644
--- a/src/resolver.ts
+++ b/src/resolver.ts
@@ -1486,13 +1486,14 @@ export class Resolver extends DiagnosticEmitter {
     if (!targetType) return null;
     if (targetType.is(TypeFlags.REFERENCE)) {
       let classReference = targetType.classReference;
-      if (classReference) {
+      while (classReference) {
         let indexSignature = classReference.indexSignature;
         if (indexSignature) {
           this.currentThisExpression = targetExpression;
           this.currentElementExpression = node.elementExpression;
           return indexSignature;
         }
+        classReference = classReference.base;
       }
     }
     if (reportMode == ReportMode.REPORT) {
diff --git a/tests/compiler/resolve-elementaccess.optimized.wat b/tests/compiler/resolve-elementaccess.optimized.wat
index 317e1e7750..c200e81951 100644
--- a/tests/compiler/resolve-elementaccess.optimized.wat
+++ b/tests/compiler/resolve-elementaccess.optimized.wat
@@ -1,10 +1,11 @@
 (module
- (type $i32_=>_none (func (param i32)))
- (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (type $i32_i32_f32_=>_none (func (param i32 i32 f32)))
  (type $i32_i64_i32_i64_i32_i64_i32_=>_i32 (func (param i32 i64 i32 i64 i32 i64 i32) (result i32)))
@@ -31,6 +32,10 @@
  (data (i32.const 1472) "0\00\00\00\01\00\00\00\01\00\00\000\00\00\00r\00e\00s\00o\00l\00v\00e\00-\00e\00l\00e\00m\00e\00n\00t\00a\00c\00c\00e\00s\00s\00.\00t\00s")
  (data (i32.const 1536) "\06\00\00\00\01\00\00\00\01\00\00\00\06\00\00\002\00.\000")
  (data (i32.const 1568) "\08\00\00\00\01\00\00\00\01\00\00\00\08\00\00\001\001\00.\000")
+ (data (i32.const 1600) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\000")
+ (data (i32.const 1632) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\001")
+ (data (i32.const 1664) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\002")
+ (data (i32.const 1696) "\04\00\00\00\01\00\00\00\01\00\00\00\04\00\00\001\001")
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
  (global $resolve-elementaccess/arr (mut i32) (i32.const 0))
@@ -40,6 +45,7 @@
  (global $~lib/util/number/_K (mut i32) (i32.const 0))
  (global $~lib/util/number/_frc_pow (mut i64) (i64.const 0))
  (global $~lib/util/number/_exp_pow (mut i32) (i32.const 0))
+ (global $resolve-elementaccess/buf (mut i32) (i32.const 0))
  (export "memory" (memory $0))
  (start $~start)
  (func $~lib/rt/stub/maybeGrowMemory (; 1 ;) (param $0 i32)
@@ -129,56 +135,240 @@
   i32.store offset=12
   local.get $3
  )
- (func $~lib/memory/memory.fill (; 3 ;) (param $0 i32)
-  (local $1 i32)
-  local.get $0
-  i32.const 0
-  i32.store8
-  local.get $0
-  i32.const 8
-  i32.add
-  local.tee $1
-  i32.const 1
-  i32.sub
-  i32.const 0
-  i32.store8
-  local.get $0
-  i32.const 1
-  i32.add
-  i32.const 0
-  i32.store8
-  local.get $0
+ (func $~lib/memory/memory.fill (; 3 ;) (param $0 i32) (param $1 i32)
+  (local $2 i32)
+  block $~lib/util/memory/memset|inlined.0
+   local.get $1
+   i32.eqz
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $0
+   i32.const 0
+   i32.store8
+   local.get $0
+   local.get $1
+   i32.add
+   i32.const 1
+   i32.sub
+   i32.const 0
+   i32.store8
+   local.get $1
+   i32.const 2
+   i32.le_u
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $0
+   i32.const 1
+   i32.add
+   i32.const 0
+   i32.store8
+   local.get $0
+   i32.const 2
+   i32.add
+   i32.const 0
+   i32.store8
+   local.get $0
+   local.get $1
+   i32.add
+   local.tee $2
+   i32.const 2
+   i32.sub
+   i32.const 0
+   i32.store8
+   local.get $2
+   i32.const 3
+   i32.sub
+   i32.const 0
+   i32.store8
+   local.get $1
+   i32.const 6
+   i32.le_u
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $0
+   i32.const 3
+   i32.add
+   i32.const 0
+   i32.store8
+   local.get $0
+   local.get $1
+   i32.add
+   i32.const 4
+   i32.sub
+   i32.const 0
+   i32.store8
+   local.get $1
+   i32.const 8
+   i32.le_u
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $1
+   i32.const 0
+   local.get $0
+   i32.sub
+   i32.const 3
+   i32.and
+   local.tee $1
+   i32.sub
+   local.set $2
+   local.get $0
+   local.get $1
+   i32.add
+   local.tee $0
+   i32.const 0
+   i32.store
+   local.get $0
+   local.get $2
+   i32.const -4
+   i32.and
+   local.tee $1
+   i32.add
+   i32.const 4
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $1
+   i32.const 8
+   i32.le_u
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $0
+   i32.const 4
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   i32.const 8
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   local.get $1
+   i32.add
+   local.tee $2
+   i32.const 12
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $2
+   i32.const 8
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $1
+   i32.const 24
+   i32.le_u
+   br_if $~lib/util/memory/memset|inlined.0
+   local.get $0
+   i32.const 12
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   i32.const 16
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   i32.const 20
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   i32.const 24
+   i32.add
+   i32.const 0
+   i32.store
+   local.get $0
+   local.get $1
+   i32.add
+   local.tee $2
+   i32.const 28
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $2
+   i32.const 24
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $2
+   i32.const 20
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $2
+   i32.const 16
+   i32.sub
+   i32.const 0
+   i32.store
+   local.get $0
+   local.get $0
+   i32.const 4
+   i32.and
+   i32.const 24
+   i32.add
+   local.tee $2
+   i32.add
+   local.set $0
+   local.get $1
+   local.get $2
+   i32.sub
+   local.set $1
+   loop $while-continue|0
+    local.get $1
+    i32.const 32
+    i32.ge_u
+    if
+     local.get $0
+     i64.const 0
+     i64.store
+     local.get $0
+     i32.const 8
+     i32.add
+     i64.const 0
+     i64.store
+     local.get $0
+     i32.const 16
+     i32.add
+     i64.const 0
+     i64.store
+     local.get $0
+     i32.const 24
+     i32.add
+     i64.const 0
+     i64.store
+     local.get $1
+     i32.const 32
+     i32.sub
+     local.set $1
+     local.get $0
+     i32.const 32
+     i32.add
+     local.set $0
+     br $while-continue|0
+    end
+   end
+  end
+ )
+ (func $~lib/arraybuffer/ArrayBufferView#constructor (; 4 ;) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
   i32.const 2
-  i32.add
-  i32.const 0
-  i32.store8
+  i32.const 1073741808
   local.get $1
+  i32.shr_u
+  i32.gt_u
+  if
+   i32.const 32
+   i32.const 80
+   i32.const 23
+   i32.const 56
+   call $~lib/builtins/abort
+   unreachable
+  end
   i32.const 2
-  i32.sub
-  i32.const 0
-  i32.store8
   local.get $1
-  i32.const 3
-  i32.sub
-  i32.const 0
-  i32.store8
-  local.get $0
-  i32.const 3
-  i32.add
-  i32.const 0
-  i32.store8
-  local.get $1
-  i32.const 4
-  i32.sub
-  i32.const 0
-  i32.store8
- )
- (func $~lib/arraybuffer/ArrayBufferView#constructor (; 4 ;) (param $0 i32) (result i32)
-  (local $1 i32)
-  i32.const 8
+  i32.shl
+  local.tee $2
   i32.const 0
   call $~lib/rt/stub/__alloc
   local.tee $1
+  local.get $2
   call $~lib/memory/memory.fill
   local.get $0
   i32.eqz
@@ -207,7 +397,7 @@
   local.get $1
   i32.store offset=4
   local.get $0
-  i32.const 8
+  local.get $2
   i32.store offset=8
   local.get $0
  )
@@ -1734,15 +1924,83 @@
   end
   i32.const 0
  )
- (func $start:resolve-elementaccess (; 20 ;)
+ (func $~lib/typedarray/Uint8Array#__set (; 20 ;) (param $0 i32) (param $1 i32) (param $2 i32)
+  local.get $1
+  local.get $0
+  i32.load offset=8
+  i32.ge_u
+  if
+   i32.const 144
+   i32.const 208
+   i32.const 163
+   i32.const 44
+   call $~lib/builtins/abort
+   unreachable
+  end
+  local.get $1
+  local.get $0
+  i32.load offset=4
+  i32.add
+  local.get $2
+  i32.store8
+ )
+ (func $~lib/typedarray/Uint8Array#__get (; 21 ;) (param $0 i32) (param $1 i32) (result i32)
+  local.get $1
+  local.get $0
+  i32.load offset=8
+  i32.ge_u
+  if
+   i32.const 144
+   i32.const 208
+   i32.const 152
+   i32.const 44
+   call $~lib/builtins/abort
+   unreachable
+  end
+  local.get $1
+  local.get $0
+  i32.load offset=4
+  i32.add
+  i32.load8_u
+ )
+ (func $~lib/util/number/utoa32 (; 22 ;) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  local.get $0
+  i32.eqz
+  if
+   i32.const 1616
+   return
+  end
+  local.get $0
+  call $~lib/util/number/decimalCount32
+  local.tee $1
+  i32.const 1
+  i32.shl
+  i32.const 1
+  call $~lib/rt/stub/__alloc
+  local.tee $2
+  local.get $0
+  local.get $1
+  call $~lib/util/number/utoa_simple<u32>
+  local.get $2
+ )
+ (func $~lib/number/U8#toString (; 23 ;) (param $0 i32) (result i32)
+  local.get $0
+  i32.const 255
+  i32.and
+  call $~lib/util/number/utoa32
+ )
+ (func $start:resolve-elementaccess (; 24 ;)
   (local $0 i32)
-  i32.const 1600
+  i32.const 1728
   global.set $~lib/rt/stub/startOffset
-  i32.const 1600
+  i32.const 1728
   global.set $~lib/rt/stub/offset
   i32.const 12
   i32.const 3
   call $~lib/rt/stub/__alloc
+  i32.const 2
   call $~lib/arraybuffer/ArrayBufferView#constructor
   global.set $resolve-elementaccess/arr
   global.get $resolve-elementaccess/arr
@@ -1763,7 +2021,7 @@
   if
    i32.const 0
    i32.const 1488
-   i32.const 4
+   i32.const 5
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -1778,7 +2036,7 @@
   if
    i32.const 0
    i32.const 1488
-   i32.const 9
+   i32.const 10
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -1802,7 +2060,7 @@
   if
    i32.const 0
    i32.const 1488
-   i32.const 14
+   i32.const 15
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -1823,13 +2081,111 @@
   if
    i32.const 0
    i32.const 1488
-   i32.const 20
+   i32.const 21
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 12
+  i32.const 7
+  call $~lib/rt/stub/__alloc
+  local.tee $0
+  i32.eqz
+  if
+   i32.const 12
+   i32.const 8
+   call $~lib/rt/stub/__alloc
+   local.set $0
+  end
+  local.get $0
+  i32.const 0
+  call $~lib/arraybuffer/ArrayBufferView#constructor
+  global.set $resolve-elementaccess/buf
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  i32.const 1
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 1
+  i32.const 2
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  i32.const 1648
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1488
+   i32.const 28
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  i32.const 1
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  i32.const 1680
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1488
+   i32.const 33
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  local.tee $0
+  i32.const 0
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 10
+  i32.add
+  call $~lib/typedarray/Uint8Array#__set
+  local.get $0
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  i32.const 1712
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1488
+   i32.const 38
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 10
+  i32.add
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 21
+  i32.ne
+  if
+   i32.const 0
+   i32.const 1488
+   i32.const 44
    i32.const 0
    call $~lib/builtins/abort
    unreachable
   end
  )
- (func $~start (; 21 ;)
+ (func $~start (; 25 ;)
   call $start:resolve-elementaccess
  )
 )
diff --git a/tests/compiler/resolve-elementaccess.ts b/tests/compiler/resolve-elementaccess.ts
index 7b68b3230c..d10029bb63 100644
--- a/tests/compiler/resolve-elementaccess.ts
+++ b/tests/compiler/resolve-elementaccess.ts
@@ -1,3 +1,4 @@
+// Direct
 var arr = new Float32Array(2);
 arr[0] = 1;
 arr[1] = 2;
@@ -18,3 +19,26 @@ assert(
 );
 arr[0] += 10; // void context
 assert(arr[0] == 21.0);
+
+// Inherited
+class Buffer extends Uint8Array {}
+var buf = new Buffer(2);
+buf[0] = 1;
+buf[1] = 2;
+assert(
+  buf[0].toString()
+  ==
+  "1"
+);
+assert(
+  (buf[1]).toString()
+  ==
+  "2"
+);
+assert(
+  (buf[0] += 10).toString()
+  ==
+  "11"
+);
+buf[0] += 10; // void context
+assert(buf[0] == 21);
diff --git a/tests/compiler/resolve-elementaccess.untouched.wat b/tests/compiler/resolve-elementaccess.untouched.wat
index 037c081a55..c3ee758117 100644
--- a/tests/compiler/resolve-elementaccess.untouched.wat
+++ b/tests/compiler/resolve-elementaccess.untouched.wat
@@ -1,8 +1,8 @@
 (module
- (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
- (type $i32_=>_none (func (param i32)))
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_none (func (param i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $none_=>_none (func))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
@@ -33,6 +33,10 @@
  (data (i32.const 1888) "0\00\00\00\01\00\00\00\01\00\00\000\00\00\00r\00e\00s\00o\00l\00v\00e\00-\00e\00l\00e\00m\00e\00n\00t\00a\00c\00c\00e\00s\00s\00.\00t\00s\00")
  (data (i32.const 1952) "\06\00\00\00\01\00\00\00\01\00\00\00\06\00\00\002\00.\000\00")
  (data (i32.const 1984) "\08\00\00\00\01\00\00\00\01\00\00\00\08\00\00\001\001\00.\000\00")
+ (data (i32.const 2016) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\000\00")
+ (data (i32.const 2048) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\001\00")
+ (data (i32.const 2080) "\02\00\00\00\01\00\00\00\01\00\00\00\02\00\00\002\00")
+ (data (i32.const 2112) "\04\00\00\00\01\00\00\00\01\00\00\00\04\00\00\001\001\00")
  (table $0 1 funcref)
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
@@ -44,7 +48,8 @@
  (global $~lib/util/number/_K (mut i32) (i32.const 0))
  (global $~lib/util/number/_frc_pow (mut i64) (i64.const 0))
  (global $~lib/util/number/_exp_pow (mut i32) (i32.const 0))
- (global $~lib/heap/__heap_base i32 (i32.const 2008))
+ (global $resolve-elementaccess/buf (mut i32) (i32.const 0))
+ (global $~lib/heap/__heap_base i32 (i32.const 2132))
  (export "memory" (memory $0))
  (start $~start)
  (func $~lib/rt/stub/maybeGrowMemory (; 1 ;) (param $0 i32)
@@ -3683,11 +3688,129 @@
   call $~lib/rt/stub/__release
   local.get $2
  )
- (func $start:resolve-elementaccess (; 24 ;)
+ (func $~lib/typedarray/Uint8Array#constructor (; 24 ;) (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  if (result i32)
+   local.get $0
+  else
+   i32.const 12
+   i32.const 8
+   call $~lib/rt/stub/__alloc
+   call $~lib/rt/stub/__retain
+  end
+  local.get $1
+  i32.const 0
+  call $~lib/arraybuffer/ArrayBufferView#constructor
+  local.set $0
+  local.get $0
+ )
+ (func $resolve-elementaccess/Buffer#constructor (; 25 ;) (param $0 i32) (param $1 i32) (result i32)
+  local.get $0
+  i32.eqz
+  if
+   i32.const 12
+   i32.const 7
+   call $~lib/rt/stub/__alloc
+   call $~lib/rt/stub/__retain
+   local.set $0
+  end
+  local.get $0
+  local.get $1
+  call $~lib/typedarray/Uint8Array#constructor
+  local.set $0
+  local.get $0
+ )
+ (func $~lib/typedarray/Uint8Array#__set (; 26 ;) (param $0 i32) (param $1 i32) (param $2 i32)
+  local.get $1
+  local.get $0
+  i32.load offset=8
+  i32.ge_u
+  if
+   i32.const 144
+   i32.const 208
+   i32.const 163
+   i32.const 44
+   call $~lib/builtins/abort
+   unreachable
+  end
+  local.get $0
+  i32.load offset=4
+  local.get $1
+  i32.add
+  local.get $2
+  i32.store8
+ )
+ (func $~lib/typedarray/Uint8Array#__get (; 27 ;) (param $0 i32) (param $1 i32) (result i32)
+  local.get $1
+  local.get $0
+  i32.load offset=8
+  i32.ge_u
+  if
+   i32.const 144
+   i32.const 208
+   i32.const 152
+   i32.const 44
+   call $~lib/builtins/abort
+   unreachable
+  end
+  local.get $0
+  i32.load offset=4
+  local.get $1
+  i32.add
+  i32.load8_u
+ )
+ (func $~lib/util/number/utoa32 (; 28 ;) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  local.get $0
+  i32.eqz
+  if
+   i32.const 2032
+   return
+  end
+  local.get $0
+  call $~lib/util/number/decimalCount32
+  local.set $1
+  local.get $1
+  i32.const 1
+  i32.shl
+  i32.const 1
+  call $~lib/rt/stub/__alloc
+  local.set $2
+  local.get $2
+  local.set $5
+  local.get $0
+  local.set $4
+  local.get $1
+  local.set $3
+  local.get $5
+  local.get $4
+  local.get $3
+  call $~lib/util/number/utoa32_lut
+  local.get $2
+  call $~lib/rt/stub/__retain
+ )
+ (func $~lib/util/number/itoa<u8> (; 29 ;) (param $0 i32) (result i32)
+  local.get $0
+  i32.const 255
+  i32.and
+  call $~lib/util/number/utoa32
+  return
+ )
+ (func $~lib/number/U8#toString (; 30 ;) (param $0 i32) (result i32)
+  local.get $0
+  call $~lib/util/number/itoa<u8>
+ )
+ (func $start:resolve-elementaccess (; 31 ;)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
   global.get $~lib/heap/__heap_base
   i32.const 15
   i32.add
@@ -3721,7 +3844,7 @@
   if
    i32.const 0
    i32.const 1904
-   i32.const 4
+   i32.const 5
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -3737,7 +3860,7 @@
   if
    i32.const 0
    i32.const 1904
-   i32.const 9
+   i32.const 10
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -3763,7 +3886,7 @@
   if
    i32.const 0
    i32.const 1904
-   i32.const 14
+   i32.const 15
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -3785,7 +3908,99 @@
   if
    i32.const 0
    i32.const 1904
-   i32.const 20
+   i32.const 21
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 2
+  call $resolve-elementaccess/Buffer#constructor
+  global.set $resolve-elementaccess/buf
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  i32.const 1
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 1
+  i32.const 2
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  local.tee $3
+  i32.const 2064
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1904
+   i32.const 28
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  i32.const 1
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  local.tee $2
+  i32.const 2096
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1904
+   i32.const 33
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  local.tee $4
+  i32.const 0
+  local.tee $5
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 10
+  i32.add
+  call $~lib/typedarray/Uint8Array#__set
+  local.get $4
+  local.get $5
+  call $~lib/typedarray/Uint8Array#__get
+  call $~lib/number/U8#toString
+  local.tee $4
+  i32.const 2128
+  call $~lib/string/String.__eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1904
+   i32.const 38
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 10
+  i32.add
+  call $~lib/typedarray/Uint8Array#__set
+  global.get $resolve-elementaccess/buf
+  i32.const 0
+  call $~lib/typedarray/Uint8Array#__get
+  i32.const 21
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 1904
+   i32.const 44
    i32.const 0
    call $~lib/builtins/abort
    unreachable
@@ -3796,8 +4011,12 @@
   call $~lib/rt/stub/__release
   local.get $2
   call $~lib/rt/stub/__release
+  local.get $3
+  call $~lib/rt/stub/__release
+  local.get $4
+  call $~lib/rt/stub/__release
  )
- (func $~start (; 25 ;)
+ (func $~start (; 32 ;)
   call $start:resolve-elementaccess
  )
 )