Slim down indexed access as far as currently possible

Interestingly, the same code written as statements is significantly slower. See notes.

tests/compiler/std/array-access.untouched.wat

@@ -2,8 +2,8 @@
  (type $ii (func (param i32) (result i32)))
  (type $iii (func (param i32 i32) (result i32)))
  (type $i (func (result i32)))
- (type $iiiiv (func (param i32 i32 i32 i32)))
  (type $iiii (func (param i32 i32 i32) (result i32)))
+ (type $iiiiv (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $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))
@@ -11,12 +11,11 @@
  (global $~lib/internal/arraybuffer/HEADER_SIZE i32 (i32.const 8))
  (global $~lib/internal/string/HEADER_SIZE i32 (i32.const 4))
  (global $~argc (mut i32) (i32.const 0))
- (global $HEAP_BASE i32 (i32.const 84))
+ (global $HEAP_BASE i32 (i32.const 52))
  (memory $0 1)
- (data (i32.const 4) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
- (data (i32.const 36) "\00\00\00\00")
- (data (i32.const 40) "\0e\00\00\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s\00")
- (data (i32.const 72) "\04\00\00\00n\00u\00l\00l\00")
+ (data (i32.const 4) "\00\00\00\00")
+ (data (i32.const 8) "\0e\00\00\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00.\00t\00s\00")
+ (data (i32.const 40) "\04\00\00\00n\00u\00l\00l\00")
  (export "i32ArrayArrayElementAccess" (func $std/array-access/i32ArrayArrayElementAccess))
  (export "stringArrayPropertyAccess" (func $std/array-access/stringArrayPropertyAccess))
  (export "stringArrayMethodCall" (func $std/array-access/stringArrayMethodCall))
@@ -25,111 +24,63 @@
  (export "memory" (memory $0))
  (func $~lib/array/Array<Array<i32>>#__get (; 1 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
-  (local $3 i32)
-  (local $4 i32)
-  (local $5 i32)
   (set_local $2
    (i32.load
     (get_local $0)
    )
   )
-  (set_local $3
-   (i32.shr_u
-    (i32.load
-     (get_local $2)
-    )
-    (i32.const 2)
-   )
-  )
-  (if
-   (i32.ge_u
-    (get_local $1)
-    (get_local $3)
-   )
-   (block
-    (call $abort
-     (i32.const 0)
-     (i32.const 4)
-     (i32.const 64)
-     (i32.const 37)
-    )
-    (unreachable)
-   )
-  )
   (return
-   (block $~lib/internal/arraybuffer/loadUnsafe<Array<i32>>|inlined.0 (result i32)
-    (set_local $4
-     (get_local $2)
-    )
-    (set_local $5
+   (if (result i32)
+    (i32.lt_u
      (get_local $1)
+     (i32.shr_u
+      (i32.load
+       (get_local $2)
+      )
+      (i32.const 2)
+     )
     )
-    (br $~lib/internal/arraybuffer/loadUnsafe<Array<i32>>|inlined.0
-     (i32.load offset=8
-      (i32.add
-       (get_local $4)
-       (i32.shl
-        (get_local $5)
-        (i32.const 2)
-       )
+    (i32.load offset=8
+     (i32.add
+      (get_local $2)
+      (i32.shl
+       (get_local $1)
+       (i32.const 2)
       )
      )
     )
+    (unreachable)
    )
   )
  )
  (func $~lib/array/Array<i32>#__get (; 2 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
-  (local $3 i32)
-  (local $4 i32)
-  (local $5 i32)
   (set_local $2
    (i32.load
     (get_local $0)
    )
   )
-  (set_local $3
-   (i32.shr_u
-    (i32.load
-     (get_local $2)
-    )
-    (i32.const 2)
-   )
-  )
-  (if
-   (i32.ge_u
-    (get_local $1)
-    (get_local $3)
-   )
-   (block
-    (call $abort
-     (i32.const 0)
-     (i32.const 4)
-     (i32.const 64)
-     (i32.const 37)
-    )
-    (unreachable)
-   )
-  )
   (return
-   (block $~lib/internal/arraybuffer/loadUnsafe<i32>|inlined.0 (result i32)
-    (set_local $4
-     (get_local $2)
-    )
-    (set_local $5
+   (if (result i32)
+    (i32.lt_u
      (get_local $1)
+     (i32.shr_u
+      (i32.load
+       (get_local $2)
+      )
+      (i32.const 2)
+     )
     )
-    (br $~lib/internal/arraybuffer/loadUnsafe<i32>|inlined.0
-     (i32.load offset=8
-      (i32.add
-       (get_local $4)
-       (i32.shl
-        (get_local $5)
-        (i32.const 2)
-       )
+    (i32.load offset=8
+     (i32.add
+      (get_local $2)
+      (i32.shl
+       (get_local $1)
+       (i32.const 2)
       )
      )
     )
+    (unreachable)
    )
   )
  )
@@ -146,56 +97,32 @@
  )
  (func $~lib/array/Array<String>#__get (; 4 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
-  (local $3 i32)
-  (local $4 i32)
-  (local $5 i32)
   (set_local $2
    (i32.load
     (get_local $0)
    )
   )
-  (set_local $3
-   (i32.shr_u
-    (i32.load
-     (get_local $2)
-    )
-    (i32.const 2)
-   )
-  )
-  (if
-   (i32.ge_u
-    (get_local $1)
-    (get_local $3)
-   )
-   (block
-    (call $abort
-     (i32.const 0)
-     (i32.const 4)
-     (i32.const 64)
-     (i32.const 37)
-    )
-    (unreachable)
-   )
-  )
   (return
-   (block $~lib/internal/arraybuffer/loadUnsafe<String>|inlined.0 (result i32)
-    (set_local $4
-     (get_local $2)
-    )
-    (set_local $5
+   (if (result i32)
+    (i32.lt_u
      (get_local $1)
+     (i32.shr_u
+      (i32.load
+       (get_local $2)
+      )
+      (i32.const 2)
+     )
     )
-    (br $~lib/internal/arraybuffer/loadUnsafe<String>|inlined.0
-     (i32.load offset=8
-      (i32.add
-       (get_local $4)
-       (i32.shl
-        (get_local $5)
-        (i32.const 2)
-       )
+    (i32.load offset=8
+     (i32.add
+      (get_local $2)
+      (i32.shl
+       (get_local $1)
+       (i32.const 2)
       )
      )
     )
+    (unreachable)
    )
   )
  )
@@ -292,7 +219,7 @@
    (block
     (call $abort
      (i32.const 0)
-     (i32.const 40)
+     (i32.const 8)
      (i32.const 231)
      (i32.const 4)
     )
@@ -305,7 +232,7 @@
     (i32.const 0)
    )
    (set_local $1
-    (i32.const 72)
+    (i32.const 40)
    )
   )
   (set_local $3
@@ -417,7 +344,7 @@
       (get_local $0)
       (i32.const 0)
      )
-     (i32.const 36)
+     (i32.const 4)
      (i32.const 0)
     )
    )
@@ -425,56 +352,32 @@
  )
  (func $~lib/array/Array<Array<String>>#__get (; 10 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
-  (local $3 i32)
-  (local $4 i32)
-  (local $5 i32)
   (set_local $2
    (i32.load
     (get_local $0)
    )
   )
-  (set_local $3
-   (i32.shr_u
-    (i32.load
-     (get_local $2)
-    )
-    (i32.const 2)
-   )
-  )
-  (if
-   (i32.ge_u
-    (get_local $1)
-    (get_local $3)
-   )
-   (block
-    (call $abort
-     (i32.const 0)
-     (i32.const 4)
-     (i32.const 64)
-     (i32.const 37)
-    )
-    (unreachable)
-   )
-  )
   (return
-   (block $~lib/internal/arraybuffer/loadUnsafe<Array<String>>|inlined.0 (result i32)
-    (set_local $4
-     (get_local $2)
-    )
-    (set_local $5
+   (if (result i32)
+    (i32.lt_u
      (get_local $1)
+     (i32.shr_u
+      (i32.load
+       (get_local $2)
+      )
+      (i32.const 2)
+     )
     )
-    (br $~lib/internal/arraybuffer/loadUnsafe<Array<String>>|inlined.0
-     (i32.load offset=8
-      (i32.add
-       (get_local $4)
-       (i32.shl
-        (get_local $5)
-        (i32.const 2)
-       )
+    (i32.load offset=8
+     (i32.add
+      (get_local $2)
+      (i32.shl
+       (get_local $1)
+       (i32.const 2)
       )
      )
     )
+    (unreachable)
    )
   )
  )
@@ -505,7 +408,7 @@
       )
       (i32.const 1)
      )
-     (i32.const 36)
+     (i32.const 4)
      (i32.const 0)
     )
    )