From: Mike Pall <mike>
Date: Sun, 10 Mar 2024 16:26:03 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=913df6a94517d31c7be1a6133b8f35a62e51ff7a;p=thirdparty%2FLuaJIT.git

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

913df6a94517d31c7be1a6133b8f35a62e51ff7a
diff --cc src/lj_record.c
index b7af5896,f2a06f41..a9092d92
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@@ -948,10 -728,10 +948,10 @@@ void lj_record_ret(jit_State *J, BCReg 
      if ((pt->flags & PROTO_NOJIT))
        lj_trace_err(J, LJ_TRERR_CJITOFF);
      if (J->framedepth == 0 && J->pt && frame == J->L->base - 1) {
-       if (check_downrec_unroll(J, pt)) {
+       if (!J->cur.root && check_downrec_unroll(J, pt)) {
  	J->maxslot = (BCReg)(rbase + gotresults);
  	lj_snap_purge(J);
 -	rec_stop(J, LJ_TRLINK_DOWNREC, J->cur.traceno);  /* Down-recursion. */
 +	lj_record_stop(J, LJ_TRLINK_DOWNREC, J->cur.traceno);  /* Down-rec. */
  	return;
        }
        lj_snap_add(J);