Merge branch 'master' into v2.1

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lj_asm.c b/src/lj_asm.c
index 71d9a881..0b6738da 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -1721,6 +1721,11 @@ static void asm_head_side(ASMState *as)
   int pass3 = 0;
   IRRef i;
 
+  if (as->snapno && as->topslot > as->parent->topslot) {
+    /* Force snap #0 alloc to prevent register overwrite in stack check. */
+    as->snapno = 0;
+    asm_snap_alloc(as);
+  }
   allow = asm_head_side_base(as, irp, allow);
 
   /* Scan all parent SLOADs and collect register dependencies. */