Drop marks from replayed instructions when sinking.

Mike Pall · Mike Pall · commit 4808e62a9a05 · 2015-10-15T02:28:04.000+02:00
Reported by Vyacheslav Egorov.
diff --git a/src/lj_snap.c b/src/lj_snap.c
@@ -515,7 +515,7 @@ void lj_snap_replay(jit_State *J, GCtrace *T)
 	    op2 = emitir_raw(IRT(IR_HIOP, IRT_I64), op2,
 			     snap_pref(J, T, map, nent, seen, (ir+1)->op2));
 	  }
-	  J->slot[snap_slot(sn)] = emitir(ir->ot, op1, op2);
+	  J->slot[snap_slot(sn)] = emitir(ir->ot & ~(IRT_MARK|IRT_ISPHI), op1, op2);
 	} else {
 	  IRIns *irs;
 	  TRef tr = emitir(ir->ot, op1, op2);

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ void lj_snap_replay(jit_State J, GCtrace T)`
`515`	`515`	`op2 = emitir_raw(IRT(IR_HIOP, IRT_I64), op2,`
`516`	`516`	`snap_pref(J, T, map, nent, seen, (ir+1)->op2));`
`517`	`517`	`}`
`518`		`- J->slot[snap_slot(sn)] = emitir(ir->ot, op1, op2);`
	`518`	`+ J->slot[snap_slot(sn)] = emitir(ir->ot & ~(IRT_MARK\|IRT_ISPHI), op1, op2);`
`519`	`519`	`} else {`
`520`	`520`	`IRIns *irs;`
`521`	`521`	`TRef tr = emitir(ir->ot, op1, op2);`