Merge branch 'master' into v2.1

mijingling · Oct 12, 2020 · 675e08c · 675e08c
2 parents 4bb2e4a 5c46f47
commit 675e08c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/lj_record.c b/src/lj_record.c
@@ -571,10  571,10 @@ static LoopEvent rec_iterl(jit_State *J, const BCIns iterins)
 }
 
 /* Record LOOP/JLOOP. Now, that was easy. */
-static LoopEvent rec_loop(jit_State *J, BCReg ra)
 static LoopEvent rec_loop(jit_State *J, BCReg ra, int skip)
 {
   if (ra < J->maxslot) J->maxslot = ra;
-  J->pc  ;
   J->pc  = skip;
   return LOOPEV_ENTER;
 }
 
@@ -2424,7  2424,7 @@ void lj_record_ins(jit_State *J)
     rec_loop_interp(J, pc, rec_iterl(J, *pc));
     break;
   case BC_LOOP:
-    rec_loop_interp(J, pc, rec_loop(J, ra));
     rec_loop_interp(J, pc, rec_loop(J, ra, 1));
     break;
 
   case BC_JFORL:
@@ -2434,7  2434,8 @@ void lj_record_ins(jit_State *J)
     rec_loop_jit(J, rc, rec_iterl(J, traceref(J, rc)->startins));
     break;
   case BC_JLOOP:
-    rec_loop_jit(J, rc, rec_loop(J, ra));
     rec_loop_jit(J, rc, rec_loop(J, ra,
 				 !bc_isret(bc_op(traceref(J, rc)->startins))));
     break;
 
   case BC_IFORL:

diff --git a/src/lj_snap.c b/src/lj_snap.c
@@ -121,6  121,9 @@ static MSize snapshot_framelinks(jit_State *J, SnapEntry *map, uint8_t *topslot)
   MSize f = 0;
   map[f  ] = SNAP_MKPC(J->pc);  /* The current PC is always the first entry. */
 #endif
   lj_assertJ(!J->pt ||
 	     (J->pc >= proto_bc(J->pt) &&
 	      J->pc < proto_bc(J->pt)   J->pt->sizebc), "bad snapshot PC");
   while (frame > lim) {  /* Backwards traversal of all frames above base. */
     if (frame_islua(frame)) {
 #if !LJ_FR2