fix: use correct index as shadowstack slot key

Author: HerrCai0907

src/passes/shadowstack.ts

@@ -350,7 +350,7 @@ export class ShadowStackPass extends Pass {
       }
       let currentFunction = this.currentFunction;
       let numLocals = _BinaryenFunctionGetNumLocals(currentFunction);
-      let slotIndex = this.noteSlot(currentFunction, numLocals + this.callSlotOffset + i);
+      let slotIndex = this.noteSlot(currentFunction, numLocals + this.callSlotOffset + numSlots);
       let temp = this.getSharedTemp(currentFunction, this.ptrType);
       let stmts = new Array<ExpressionRef>();
       // t = value

tests/compiler/bindings/esm.debug.wat

@@ -1147,7 +1147,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 378
+   i32.const 382
    i32.const 14
    call $~lib/builtins/abort
    unreachable
@@ -1193,7 +1193,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 385
+    i32.const 389
     i32.const 16
     call $~lib/builtins/abort
     unreachable
@@ -1226,7 +1226,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 398
+    i32.const 402
     i32.const 5
     call $~lib/builtins/abort
     unreachable
@@ -1470,7 +1470,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 560
+   i32.const 562
    i32.const 3
    call $~lib/builtins/abort
    unreachable
@@ -1799,7 +1799,7 @@
   if
    i32.const 336
    i32.const 672
-   i32.const 459
+   i32.const 461
    i32.const 29
    call $~lib/builtins/abort
    unreachable
@@ -1808,6 +1808,26 @@
   call $~lib/rt/tlsf/computeSize
   return
  )
+ (func $~lib/rt/tlsf/roundSize (param $size i32) (result i32)
+  local.get $size
+  i32.const 536870910
+  i32.lt_u
+  if (result i32)
+   local.get $size
+   i32.const 1
+   i32.const 27
+   local.get $size
+   i32.clz
+   i32.sub
+   i32.shl
+   i32.add
+   i32.const 1
+   i32.sub
+  else
+   local.get $size
+  end
+  return
+ )
  (func $~lib/rt/tlsf/searchBlock (param $root i32) (param $size i32) (result i32)
   (local $fl i32)
   (local $sl i32)
@@ -1837,24 +1857,13 @@
    local.set $sl
   else
    local.get $size
-   i32.const 536870910
-   i32.lt_u
-   if (result i32)
-    local.get $size
-    i32.const 1
-    i32.const 27
-    local.get $size
-    i32.clz
-    i32.sub
-    i32.shl
-    i32.add
-    i32.const 1
-    i32.sub
-   else
-    local.get $size
-   end
+   call $~lib/rt/tlsf/roundSize
    local.set $requestSize
-   i32.const 31
+   i32.const 4
+   i32.const 8
+   i32.mul
+   i32.const 1
+   i32.sub
    local.get $requestSize
    i32.clz
    i32.sub
@@ -1892,7 +1901,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 330
+   i32.const 334
    i32.const 14
    call $~lib/builtins/abort
    unreachable
@@ -1963,7 +1972,7 @@
     if
      i32.const 0
      i32.const 672
-     i32.const 343
+     i32.const 347
      i32.const 18
      call $~lib/builtins/abort
      unreachable
@@ -2026,6 +2035,14 @@
   (local $pagesAfter i32)
   i32.const 0
   drop
+  local.get $size
+  i32.const 256
+  i32.ge_u
+  if
+   local.get $size
+   call $~lib/rt/tlsf/roundSize
+   local.set $size
+  end
   memory.size $0
   local.set $pagesBefore
   local.get $size
@@ -2047,22 +2064,6 @@
   i32.add
   local.set $size
   local.get $size
-  i32.const 536870910
-  i32.lt_u
-  if
-   local.get $size
-   i32.const 1
-   i32.const 27
-   local.get $size
-   i32.clz
-   i32.sub
-   i32.shl
-   i32.const 1
-   i32.sub
-   i32.add
-   local.set $size
-  end
-  local.get $size
   i32.const 65535
   i32.add
   i32.const 65535
@@ -2128,7 +2129,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 357
+   i32.const 361
    i32.const 14
    call $~lib/builtins/abort
    unreachable
@@ -2243,7 +2244,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 497
+    i32.const 499
     i32.const 16
     call $~lib/builtins/abort
     unreachable
@@ -2263,7 +2264,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 499
+   i32.const 501
    i32.const 14
    call $~lib/builtins/abort
    unreachable
@@ -4943,16 +4944,16 @@
   (local $i|4 i32)
   (local $5 i32)
   global.get $~lib/memory/__stack_pointer
-  i32.const 12
+  i32.const 16
   i32.sub
   global.set $~lib/memory/__stack_pointer
   call $~stack_check
   global.get $~lib/memory/__stack_pointer
   i64.const 0
   i64.store $0
   global.get $~lib/memory/__stack_pointer
-  i32.const 0
-  i32.store $0 offset=8
+  i64.const 0
+  i64.store $0 offset=8
   global.get $~lib/memory/__stack_pointer
   i32.const 0
   local.get $a
@@ -4997,7 +4998,7 @@
     local.set $5
     global.get $~lib/memory/__stack_pointer
     local.get $5
-    i32.store $0 offset=8
+    i32.store $0 offset=12
     local.get $5
     local.get $i
     call $~lib/array/Array<~lib/string/String>#__get
@@ -5037,7 +5038,7 @@
     local.set $5
     global.get $~lib/memory/__stack_pointer
     local.get $5
-    i32.store $0 offset=8
+    i32.store $0 offset=12
     local.get $5
     call $~lib/array/Array<~lib/string/String>#get:length
     local.get $i|4
@@ -5046,7 +5047,7 @@
     local.set $5
     global.get $~lib/memory/__stack_pointer
     local.get $5
-    i32.store $0 offset=8
+    i32.store $0 offset=12
     local.get $5
     local.get $i|4
     call $~lib/array/Array<~lib/string/String>#__get
@@ -5066,7 +5067,7 @@
   local.get $c
   local.set $5
   global.get $~lib/memory/__stack_pointer
-  i32.const 12
+  i32.const 16
   i32.add
   global.set $~lib/memory/__stack_pointer
   local.get $5