From: Mike Pall <mike>
Date: Mon, 24 May 2021 20:28:58 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.ROLLING~178
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fca488c715fd1592b8840b28e88346f9fb8a93f9;p=thirdparty%2FLuaJIT.git

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

fca488c715fd1592b8840b28e88346f9fb8a93f9
diff --cc src/lj_snap.c
index fee68ba5,0c5e8e90..8efe37fd
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@@ -276,10 -238,9 +276,10 @@@ static BCReg snap_usedef(jit_State *J, 
         if (!(op == BC_ISTC || op == BC_ISFC)) DEF_SLOT(bc_a(ins));
         break;
      case BCMbase:
-       if (op >= BC_CALLM && op <= BC_VARG) {
+       if (op >= BC_CALLM && op <= BC_ITERN) {
  	BCReg top = (op == BC_CALLM || op == BC_CALLMT || bc_c(ins) == 0) ?
 -		    maxslot : (bc_a(ins) + bc_c(ins));
 +		    maxslot : (bc_a(ins) + bc_c(ins)+LJ_FR2);
 +	if (LJ_FR2) DEF_SLOT(bc_a(ins)+1);
  	s = bc_a(ins) - ((op == BC_ITERC || op == BC_ITERN) ? 3 : 0);
  	for (; s < top; s++) USE_SLOT(s);
  	for (; s < maxslot; s++) DEF_SLOT(s);