From 4808e62a9a05fef36854a05e09f791148de1ad74 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Thu, 15 Oct 2015 02:28:04 +0200
Subject: [PATCH] Drop marks from replayed instructions when sinking.

Reported by Vyacheslav Egorov.
---
 src/lj_snap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lj_snap.c b/src/lj_snap.c
index ea46b831..50412bc4 100644
--- 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);