From: Mike Pall <mike>
Date: Thu, 21 Sep 2023 00:23:25 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b605a7da85f4c82d40f54635d1880e1d858c785;p=thirdparty%2FLuaJIT.git

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

4b605a7da85f4c82d40f54635d1880e1d858c785
diff --cc src/lj_trace.c
index f311d54b,25e610b5..fee78e2e
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@@ -613,9 -524,10 +613,10 @@@ static int trace_abort(jit_State *J
      J->cur.link = 0;
      J->cur.linktype = LJ_TRLINK_NONE;
      lj_vmevent_send(L, TRACE,
-       TValue *frame;
 -      cTValue *bot = tvref(L->stack);
++      cTValue *bot = tvref(L->stack)+LJ_FR2;
+       cTValue *frame;
        const BCIns *pc;
-       GCfunc *fn;
+       BCPos pos = 0;
        setstrV(L, L->top++, lj_str_newlit(L, "abort"));
        setintV(L->top++, traceno);
        /* Find original Lua function call to generate a better error message. */