]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Fix frame for more types of on-trace error messages.
authorMike Pall <mike>
Sat, 12 Aug 2023 12:48:34 +0000 (14:48 +0200)
committerMike Pall <mike>
Sat, 12 Aug 2023 12:48:34 +0000 (14:48 +0200)
Thanks to Maxim Kokryashkin. #1034

src/lj_err.c

index 3ee70b86424cb08d255482f72414704e38bcd3f9..9652ef35a13f00a14cacbf52c82345685ea358a2 100644 (file)
@@ -875,6 +875,10 @@ LJ_NORET LJ_NOINLINE static void err_msgv(lua_State *L, ErrMsg em, ...)
   const char *msg;
   va_list argp;
   va_start(argp, em);
+  if (LJ_HASJIT) {
+    TValue *base = tvref(G(L)->jit_base);
+    if (base) L->base = base;
+  }
   if (curr_funcisL(L)) L->top = curr_topL(L);
   msg = lj_strfmt_pushvf(L, err2msg(em), argp);
   va_end(argp);