From: Mike Pall <mike>
Date: Sun, 10 Dec 2023 15:13:34 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d5ea4ceb9da28eb281940e693bd859b72ef24cb;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

8d5ea4ceb9da28eb281940e693bd859b72ef24cb
diff --cc src/lj_asm_arm.h
index 348cd79f,8869af32..bd5fbeb1
--- a/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@@ -2093,7 -2045,8 +2100,8 @@@ static void asm_stack_restore(ASMState 
      }
      checkmclim(as);
    }
+   emit_addptr(as, RID_BASE, bias);
 -  lua_assert(map + nent == flinks);
 +  lj_assertA(map + nent == flinks, "inconsistent frames in snapshot");
  }
  
  /* -- GC handling --------------------------------------------------------- */