Unify allocator tests even more, also test arena

2025-06-18 17:31:29 +00:00 · 2018-03-04 17:25:32 +01:00
parent 4257273d42
commit 00c4f6fa52
36 changed files with 3463 additions and 2977 deletions
--- a/tests/compiler/std/allocator_arena.optimized.wat
+++ b/tests/compiler/std/allocator_arena.optimized.wat
@ -6,7 +6,7 @@
 (type $iv (func (param i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/allocator_arena/ptr1 (mut i32) (i32.const 0))
 (global $std/allocator_arena/ptr2 (mut i32) (i32.const 0))
 (global $std/allocator_arena/i (mut i32) (i32.const 0))
@ -19,6 +19,7 @@
  (local $1 i32)
  (local $2 i32)
  (local $3 i32)
+  (local $4 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -28,74 +29,73 @@
   )
  )
  (if
-   (i32.and
-    (if (result i32)
+   (i32.gt_u
+    (tee_local $2
+     (i32.and
+      (i32.add
+       (i32.add
+        (tee_local $1
+         (get_global "$(lib)/allocator/arena/OFFSET")
+        )
+        (get_local $0)
+       )
+       (i32.const 7)
+      )
+      (i32.const -8)
+     )
+    )
+    (i32.shl
     (tee_local $0
-      (i32.gt_u
-       (tee_local $2
-        (i32.and
-         (i32.add
-          (i32.add
-           (tee_local $3
-            (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+      (current_memory)
+     )
+     (i32.const 16)
+    )
+   )
+   (if
+    (i32.lt_s
+     (grow_memory
+      (select
+       (get_local $0)
+       (tee_local $4
+        (tee_local $3
+         (i32.shr_u
+          (i32.and
+           (i32.add
+            (i32.sub
+             (get_local $2)
+             (get_local $1)
+            )
+            (i32.const 65535)
           )
-           (get_local $0)
+           (i32.const -65536)
          )
-          (i32.const 7)
+          (i32.const 16)
         )
-         (i32.const -8)
        )
       )
-       (tee_local $1
-        (i32.shl
-         (current_memory)
-         (i32.const 16)
-        )
+       (i32.gt_s
+        (get_local $0)
+        (get_local $4)
       )
      )
     )
+     (i32.const 0)
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $0
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.const -65536)
-           )
-           (get_local $1)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $1
-         (i32.shr_u
-          (get_local $1)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $0)
-         (get_local $1)
-        )
-       )
+       (get_local $3)
      )
      (i32.const 0)
     )
-     (get_local $0)
+     (unreachable)
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
-  (get_local $3)
+  (get_local $1)
 )
 (func "$(lib)/memory/set_memory" (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
  (local $3 i64)
@ -2360,13 +2360,25 @@
  (nop)
 )
 (func "$(lib)/allocator/arena/reset_memory" (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.const -8)
+   )
  )
 )
 (func $start (; 8 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.const -8)
+   )
  )
  (set_global $std/allocator_arena/ptr1
   (call "$(lib)/allocator/arena/allocate_memory"
@ -2514,7 +2526,13 @@
  (if
   (i32.ne
    (get_global $std/allocator_arena/ptr1)
-    (get_global $HEAP_BASE)
+    (i32.and
+     (i32.add
+      (get_global $HEAP_BASE)
+      (i32.const 7)
+     )
+     (i32.const -8)
+    )
   )
   (block
    (call $abort
--- a/tests/compiler/std/allocator_arena.ts
+++ b/tests/compiler/std/allocator_arena.ts
@ -24,4 +24,4 @@ free_memory(ptr2);

 reset_memory();
 ptr1 = allocate_memory(size);
-assert(ptr1 == HEAP_BASE);
+assert(ptr1 == ((HEAP_BASE + 7) & ~7));
--- a/tests/compiler/std/allocator_arena.untouched.wat
+++ b/tests/compiler/std/allocator_arena.untouched.wat
@ -7,10 +7,10 @@
 (type $iv (func (param i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/ALIGN_LOG2" i32 (i32.const 3))
- (global "$(lib)/allocator/arena/ALIGN_SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/arena/ALIGN_MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/AL_BITS" i32 (i32.const 3))
+ (global "$(lib)/allocator/arena/AL_SIZE" i32 (i32.const 8))
+ (global "$(lib)/allocator/arena/AL_MASK" i32 (i32.const 7))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/allocator_arena/size i32 (i32.const 42))
 (global $std/allocator_arena/ptr1 (mut i32) (i32.const 0))
 (global $std/allocator_arena/ptr2 (mut i32) (i32.const 0))
@ -26,6 +26,8 @@
  (local $3 i32)
  (local $4 i32)
  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -35,7 +37,7 @@
   )
  )
  (set_local $1
-   (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+   (get_global "$(lib)/allocator/arena/OFFSET")
  )
  (set_local $2
   (i32.and
@ -53,62 +55,69 @@
   )
  )
  (set_local $3
-   (i32.shl
-    (current_memory)
-    (i32.const 16)
-   )
+   (current_memory)
  )
  (if
-   (i32.and
-    (if (result i32)
-     (tee_local $4
-      (i32.gt_u
-       (get_local $2)
+   (i32.gt_u
+    (get_local $2)
+    (i32.shl
+     (get_local $3)
+     (i32.const 16)
+    )
+   )
+   (block
+    (set_local $4
+     (i32.shr_u
+      (i32.and
+       (i32.add
+        (i32.sub
+         (get_local $2)
+         (get_local $1)
+        )
+        (i32.const 65535)
+       )
+       (i32.xor
+        (i32.const 65535)
+        (i32.const -1)
+       )
+      )
+      (i32.const 16)
+     )
+    )
+    (set_local $7
+     (select
+      (tee_local $5
       (get_local $3)
      )
+      (tee_local $6
+       (get_local $4)
+      )
+      (i32.gt_s
+       (get_local $5)
+       (get_local $6)
+      )
     )
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $4
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.xor
-             (i32.const 65535)
-             (i32.const -1)
-            )
-           )
-           (get_local $3)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $5
-         (i32.shr_u
-          (get_local $3)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $4)
-         (get_local $5)
-        )
-       )
+       (get_local $7)
      )
      (i32.const 0)
     )
-     (get_local $4)
+     (if
+      (i32.lt_s
+       (grow_memory
+        (get_local $4)
+       )
+       (i32.const 0)
+      )
+      (unreachable)
+     )
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
  (return
@ -2653,13 +2662,31 @@
 (func "$(lib)/allocator/arena/free_memory" (; 6 ;) (type $iv) (param $0 i32)
 )
 (func "$(lib)/allocator/arena/reset_memory" (; 7 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.xor
+     (i32.const 7)
+     (i32.const -1)
+    )
+   )
  )
 )
 (func $start (; 8 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.xor
+     (i32.const 7)
+     (i32.const -1)
+    )
+   )
  )
  (set_global $std/allocator_arena/ptr1
   (call "$(lib)/allocator/arena/allocate_memory"
@ -2823,7 +2850,16 @@
   (i32.eqz
    (i32.eq
     (get_global $std/allocator_arena/ptr1)
-     (get_global $HEAP_BASE)
+     (i32.and
+      (i32.add
+       (get_global $HEAP_BASE)
+       (i32.const 7)
+      )
+      (i32.xor
+       (i32.const 7)
+       (i32.const -1)
+      )
+     )
    )
   )
   (block
--- a/tests/compiler/std/array.optimized.wat
+++ b/tests/compiler/std/array.optimized.wat
@ -8,7 +8,7 @@
 (type $iiii (func (param i32 i32 i32) (result i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/array/arr (mut i32) (i32.const 0))
 (global $std/array/i (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 64))
@ -21,6 +21,7 @@
  (local $1 i32)
  (local $2 i32)
  (local $3 i32)
+  (local $4 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -30,74 +31,73 @@
   )
  )
  (if
-   (i32.and
-    (if (result i32)
+   (i32.gt_u
+    (tee_local $2
+     (i32.and
+      (i32.add
+       (i32.add
+        (tee_local $1
+         (get_global "$(lib)/allocator/arena/OFFSET")
+        )
+        (get_local $0)
+       )
+       (i32.const 7)
+      )
+      (i32.const -8)
+     )
+    )
+    (i32.shl
     (tee_local $0
-      (i32.gt_u
-       (tee_local $2
-        (i32.and
-         (i32.add
-          (i32.add
-           (tee_local $3
-            (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+      (current_memory)
+     )
+     (i32.const 16)
+    )
+   )
+   (if
+    (i32.lt_s
+     (grow_memory
+      (select
+       (get_local $0)
+       (tee_local $4
+        (tee_local $3
+         (i32.shr_u
+          (i32.and
+           (i32.add
+            (i32.sub
+             (get_local $2)
+             (get_local $1)
+            )
+            (i32.const 65535)
           )
-           (get_local $0)
+           (i32.const -65536)
          )
-          (i32.const 7)
+          (i32.const 16)
         )
-         (i32.const -8)
        )
       )
-       (tee_local $1
-        (i32.shl
-         (current_memory)
-         (i32.const 16)
-        )
+       (i32.gt_s
+        (get_local $0)
+        (get_local $4)
       )
      )
     )
+     (i32.const 0)
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $0
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.const -65536)
-           )
-           (get_local $1)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $1
-         (i32.shr_u
-          (get_local $1)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $0)
-         (get_local $1)
-        )
-       )
+       (get_local $3)
      )
      (i32.const 0)
     )
-     (get_local $0)
+     (unreachable)
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
-  (get_local $3)
+  (get_local $1)
 )
 (func "$(lib)/array/Array#get:length" (; 2 ;) (type $ii) (param $0 i32) (result i32)
  (i32.load offset=8
@ -2905,8 +2905,14 @@
  )
 )
 (func $start (; 16 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.const -8)
+   )
  )
  (set_global $std/array/arr
   (call "$(lib)/allocator/arena/allocate_memory"
--- a/tests/compiler/std/array.untouched.wat
+++ b/tests/compiler/std/array.untouched.wat
@ -9,10 +9,10 @@
 (type $iiii (func (param i32 i32 i32) (result i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/ALIGN_LOG2" i32 (i32.const 3))
- (global "$(lib)/allocator/arena/ALIGN_SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/arena/ALIGN_MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/AL_BITS" i32 (i32.const 3))
+ (global "$(lib)/allocator/arena/AL_SIZE" i32 (i32.const 8))
+ (global "$(lib)/allocator/arena/AL_MASK" i32 (i32.const 7))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/array/arr (mut i32) (i32.const 0))
 (global $std/array/i (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 64))
@ -27,6 +27,8 @@
  (local $3 i32)
  (local $4 i32)
  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -36,7 +38,7 @@
   )
  )
  (set_local $1
-   (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+   (get_global "$(lib)/allocator/arena/OFFSET")
  )
  (set_local $2
   (i32.and
@ -54,62 +56,69 @@
   )
  )
  (set_local $3
-   (i32.shl
-    (current_memory)
-    (i32.const 16)
-   )
+   (current_memory)
  )
  (if
-   (i32.and
-    (if (result i32)
-     (tee_local $4
-      (i32.gt_u
-       (get_local $2)
+   (i32.gt_u
+    (get_local $2)
+    (i32.shl
+     (get_local $3)
+     (i32.const 16)
+    )
+   )
+   (block
+    (set_local $4
+     (i32.shr_u
+      (i32.and
+       (i32.add
+        (i32.sub
+         (get_local $2)
+         (get_local $1)
+        )
+        (i32.const 65535)
+       )
+       (i32.xor
+        (i32.const 65535)
+        (i32.const -1)
+       )
+      )
+      (i32.const 16)
+     )
+    )
+    (set_local $7
+     (select
+      (tee_local $5
       (get_local $3)
      )
+      (tee_local $6
+       (get_local $4)
+      )
+      (i32.gt_s
+       (get_local $5)
+       (get_local $6)
+      )
     )
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $4
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.xor
-             (i32.const 65535)
-             (i32.const -1)
-            )
-           )
-           (get_local $3)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $5
-         (i32.shr_u
-          (get_local $3)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $4)
-         (get_local $5)
-        )
-       )
+       (get_local $7)
      )
      (i32.const 0)
     )
-     (get_local $4)
+     (if
+      (i32.lt_s
+       (grow_memory
+        (get_local $4)
+       )
+       (i32.const 0)
+      )
+      (unreachable)
+     )
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
  (return
@ -3244,8 +3253,17 @@
  )
 )
 (func $start (; 16 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.xor
+     (i32.const 7)
+     (i32.const -1)
+    )
+   )
  )
  (set_global $std/array/arr
   (call "$(lib)/allocator/arena/allocate_memory"
--- a/tests/compiler/std/new.optimized.wat
+++ b/tests/compiler/std/new.optimized.wat
@ -2,7 +2,7 @@
 (type $ii (func (param i32) (result i32)))
 (type $ifv (func (param i32 f32)))
 (type $v (func))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/new/aClass (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 4))
 (memory $0 1)
@ -12,6 +12,7 @@
  (local $1 i32)
  (local $2 i32)
  (local $3 i32)
+  (local $4 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -21,74 +22,73 @@
   )
  )
  (if
-   (i32.and
-    (if (result i32)
+   (i32.gt_u
+    (tee_local $2
+     (i32.and
+      (i32.add
+       (i32.add
+        (tee_local $1
+         (get_global "$(lib)/allocator/arena/OFFSET")
+        )
+        (get_local $0)
+       )
+       (i32.const 7)
+      )
+      (i32.const -8)
+     )
+    )
+    (i32.shl
     (tee_local $0
-      (i32.gt_u
-       (tee_local $2
-        (i32.and
-         (i32.add
-          (i32.add
-           (tee_local $3
-            (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+      (current_memory)
+     )
+     (i32.const 16)
+    )
+   )
+   (if
+    (i32.lt_s
+     (grow_memory
+      (select
+       (get_local $0)
+       (tee_local $4
+        (tee_local $3
+         (i32.shr_u
+          (i32.and
+           (i32.add
+            (i32.sub
+             (get_local $2)
+             (get_local $1)
+            )
+            (i32.const 65535)
           )
-           (get_local $0)
+           (i32.const -65536)
          )
-          (i32.const 7)
+          (i32.const 16)
         )
-         (i32.const -8)
        )
       )
-       (tee_local $1
-        (i32.shl
-         (current_memory)
-         (i32.const 16)
-        )
+       (i32.gt_s
+        (get_local $0)
+        (get_local $4)
       )
      )
     )
+     (i32.const 0)
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $0
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.const -65536)
-           )
-           (get_local $1)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $1
-         (i32.shr_u
-          (get_local $1)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $0)
-         (get_local $1)
-        )
-       )
+       (get_local $3)
      )
      (i32.const 0)
     )
-     (get_local $0)
+     (unreachable)
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
-  (get_local $3)
+  (get_local $1)
 )
 (func $std/new/AClass#constructor (; 1 ;) (type $ifv) (param $0 i32) (param $1 f32)
  (i32.store
@ -107,8 +107,14 @@
 )
 (func $start (; 2 ;) (type $v)
  (local $0 i32)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.const -8)
+   )
  )
  (set_global $std/new/aClass
   (block (result i32)
--- a/tests/compiler/std/new.untouched.wat
+++ b/tests/compiler/std/new.untouched.wat
@ -3,10 +3,10 @@
 (type $ii (func (param i32) (result i32)))
 (type $ifv (func (param i32 f32)))
 (type $v (func))
- (global "$(lib)/allocator/arena/ALIGN_LOG2" i32 (i32.const 3))
- (global "$(lib)/allocator/arena/ALIGN_SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/arena/ALIGN_MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/AL_BITS" i32 (i32.const 3))
+ (global "$(lib)/allocator/arena/AL_SIZE" i32 (i32.const 8))
+ (global "$(lib)/allocator/arena/AL_MASK" i32 (i32.const 7))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/new/aClass (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 4))
 (memory $0 1)
@ -18,6 +18,8 @@
  (local $3 i32)
  (local $4 i32)
  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -27,7 +29,7 @@
   )
  )
  (set_local $1
-   (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+   (get_global "$(lib)/allocator/arena/OFFSET")
  )
  (set_local $2
   (i32.and
@ -45,62 +47,69 @@
   )
  )
  (set_local $3
-   (i32.shl
-    (current_memory)
-    (i32.const 16)
-   )
+   (current_memory)
  )
  (if
-   (i32.and
-    (if (result i32)
-     (tee_local $4
-      (i32.gt_u
-       (get_local $2)
+   (i32.gt_u
+    (get_local $2)
+    (i32.shl
+     (get_local $3)
+     (i32.const 16)
+    )
+   )
+   (block
+    (set_local $4
+     (i32.shr_u
+      (i32.and
+       (i32.add
+        (i32.sub
+         (get_local $2)
+         (get_local $1)
+        )
+        (i32.const 65535)
+       )
+       (i32.xor
+        (i32.const 65535)
+        (i32.const -1)
+       )
+      )
+      (i32.const 16)
+     )
+    )
+    (set_local $7
+     (select
+      (tee_local $5
       (get_local $3)
      )
+      (tee_local $6
+       (get_local $4)
+      )
+      (i32.gt_s
+       (get_local $5)
+       (get_local $6)
+      )
     )
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $4
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.xor
-             (i32.const 65535)
-             (i32.const -1)
-            )
-           )
-           (get_local $3)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $5
-         (i32.shr_u
-          (get_local $3)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $4)
-         (get_local $5)
-        )
-       )
+       (get_local $7)
      )
      (i32.const 0)
     )
-     (get_local $4)
+     (if
+      (i32.lt_s
+       (grow_memory
+        (get_local $4)
+       )
+       (i32.const 0)
+      )
+      (unreachable)
+     )
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
  (return
@ -124,8 +133,17 @@
 )
 (func $start (; 2 ;) (type $v)
  (local $0 i32)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.xor
+     (i32.const 7)
+     (i32.const -1)
+    )
+   )
  )
  (set_global $std/new/aClass
   (block (result i32)
--- a/tests/compiler/std/set.optimized.wat
+++ b/tests/compiler/std/set.optimized.wat
@ -6,7 +6,7 @@
 (type $iii (func (param i32 i32) (result i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/set/set (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 56))
 (memory $0 1)
@ -18,6 +18,7 @@
  (local $1 i32)
  (local $2 i32)
  (local $3 i32)
+  (local $4 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -27,74 +28,73 @@
   )
  )
  (if
-   (i32.and
-    (if (result i32)
+   (i32.gt_u
+    (tee_local $2
+     (i32.and
+      (i32.add
+       (i32.add
+        (tee_local $1
+         (get_global "$(lib)/allocator/arena/OFFSET")
+        )
+        (get_local $0)
+       )
+       (i32.const 7)
+      )
+      (i32.const -8)
+     )
+    )
+    (i32.shl
     (tee_local $0
-      (i32.gt_u
-       (tee_local $2
-        (i32.and
-         (i32.add
-          (i32.add
-           (tee_local $3
-            (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+      (current_memory)
+     )
+     (i32.const 16)
+    )
+   )
+   (if
+    (i32.lt_s
+     (grow_memory
+      (select
+       (get_local $0)
+       (tee_local $4
+        (tee_local $3
+         (i32.shr_u
+          (i32.and
+           (i32.add
+            (i32.sub
+             (get_local $2)
+             (get_local $1)
+            )
+            (i32.const 65535)
           )
-           (get_local $0)
+           (i32.const -65536)
          )
-          (i32.const 7)
+          (i32.const 16)
         )
-         (i32.const -8)
        )
       )
-       (tee_local $1
-        (i32.shl
-         (current_memory)
-         (i32.const 16)
-        )
+       (i32.gt_s
+        (get_local $0)
+        (get_local $4)
       )
      )
     )
+     (i32.const 0)
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $0
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.const -65536)
-           )
-           (get_local $1)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $1
-         (i32.shr_u
-          (get_local $1)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $0)
-         (get_local $1)
-        )
-       )
+       (get_local $3)
      )
      (i32.const 0)
     )
-     (get_local $0)
+     (unreachable)
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
-  (get_local $3)
+  (get_local $1)
 )
 (func "$(lib)/set/Set#get:size" (; 2 ;) (type $ii) (param $0 i32) (result i32)
  (i32.load offset=8
@ -2273,8 +2273,14 @@
  )
 )
 (func $start (; 10 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.const -8)
+   )
  )
  (set_global $std/set/set
   (call "$(lib)/allocator/arena/allocate_memory"
--- a/tests/compiler/std/set.untouched.wat
+++ b/tests/compiler/std/set.untouched.wat
@ -7,10 +7,10 @@
 (type $iii (func (param i32 i32) (result i32)))
 (type $v (func))
 (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
- (global "$(lib)/allocator/arena/ALIGN_LOG2" i32 (i32.const 3))
- (global "$(lib)/allocator/arena/ALIGN_SIZE" i32 (i32.const 8))
- (global "$(lib)/allocator/arena/ALIGN_MASK" i32 (i32.const 7))
- (global "$(lib)/allocator/arena/HEAP_OFFSET" (mut i32) (i32.const 0))
+ (global "$(lib)/allocator/arena/AL_BITS" i32 (i32.const 3))
+ (global "$(lib)/allocator/arena/AL_SIZE" i32 (i32.const 8))
+ (global "$(lib)/allocator/arena/AL_MASK" i32 (i32.const 7))
+ (global "$(lib)/allocator/arena/OFFSET" (mut i32) (i32.const 0))
 (global $std/set/set (mut i32) (i32.const 0))
 (global $HEAP_BASE i32 (i32.const 56))
 (memory $0 1)
@ -24,6 +24,8 @@
  (local $3 i32)
  (local $4 i32)
  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
  (if
   (i32.eqz
    (get_local $0)
@ -33,7 +35,7 @@
   )
  )
  (set_local $1
-   (get_global "$(lib)/allocator/arena/HEAP_OFFSET")
+   (get_global "$(lib)/allocator/arena/OFFSET")
  )
  (set_local $2
   (i32.and
@ -51,62 +53,69 @@
   )
  )
  (set_local $3
-   (i32.shl
-    (current_memory)
-    (i32.const 16)
-   )
+   (current_memory)
  )
  (if
-   (i32.and
-    (if (result i32)
-     (tee_local $4
-      (i32.gt_u
-       (get_local $2)
+   (i32.gt_u
+    (get_local $2)
+    (i32.shl
+     (get_local $3)
+     (i32.const 16)
+    )
+   )
+   (block
+    (set_local $4
+     (i32.shr_u
+      (i32.and
+       (i32.add
+        (i32.sub
+         (get_local $2)
+         (get_local $1)
+        )
+        (i32.const 65535)
+       )
+       (i32.xor
+        (i32.const 65535)
+        (i32.const -1)
+       )
+      )
+      (i32.const 16)
+     )
+    )
+    (set_local $7
+     (select
+      (tee_local $5
       (get_local $3)
      )
+      (tee_local $6
+       (get_local $4)
+      )
+      (i32.gt_s
+       (get_local $5)
+       (get_local $6)
+      )
     )
+    )
+    (if
     (i32.lt_s
      (grow_memory
-       (select
-        (tee_local $4
-         (i32.shr_u
-          (i32.sub
-           (i32.and
-            (i32.add
-             (get_local $2)
-             (i32.const 65535)
-            )
-            (i32.xor
-             (i32.const 65535)
-             (i32.const -1)
-            )
-           )
-           (get_local $3)
-          )
-          (i32.const 16)
-         )
-        )
-        (tee_local $5
-         (i32.shr_u
-          (get_local $3)
-          (i32.const 16)
-         )
-        )
-        (i32.gt_u
-         (get_local $4)
-         (get_local $5)
-        )
-       )
+       (get_local $7)
      )
      (i32.const 0)
     )
-     (get_local $4)
+     (if
+      (i32.lt_s
+       (grow_memory
+        (get_local $4)
+       )
+       (i32.const 0)
+      )
+      (unreachable)
+     )
    )
-    (i32.const 1)
   )
-   (unreachable)
  )
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
+  (set_global "$(lib)/allocator/arena/OFFSET"
   (get_local $2)
  )
  (return
@ -2584,8 +2593,17 @@
  )
 )
 (func $start (; 10 ;) (type $v)
-  (set_global "$(lib)/allocator/arena/HEAP_OFFSET"
-   (get_global $HEAP_BASE)
+  (set_global "$(lib)/allocator/arena/OFFSET"
+   (i32.and
+    (i32.add
+     (get_global $HEAP_BASE)
+     (i32.const 7)
+    )
+    (i32.xor
+     (i32.const 7)
+     (i32.const -1)
+    )
+   )
  )
  (set_global $std/set/set
   (call "$(lib)/allocator/arena/allocate_memory"