diff options
| author | Mike Pall <mike> | 2015-10-15 02:29:37 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-10-15 02:29:37 +0200 |
| commit | 776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de (patch) | |
| tree | 7bfc5f708663696bd5fa8c604fc67f4f09ad34f7 | |
| parent | 22a9ed838b9bad0322a9201fedcc75fb638131e9 (diff) | |
| parent | 4808e62a9a05fef36854a05e09f791148de1ad74 (diff) | |
| download | luajit-776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de.tar.gz luajit-776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de.tar.bz2 luajit-776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_snap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index df7ae634..7c78f8a3 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
| @@ -518,7 +518,7 @@ void lj_snap_replay(jit_State *J, GCtrace *T) | |||
| 518 | op2 = emitir_raw(IRT(IR_HIOP, IRT_I64), op2, | 518 | op2 = emitir_raw(IRT(IR_HIOP, IRT_I64), op2, |
| 519 | snap_pref(J, T, map, nent, seen, (ir+1)->op2)); | 519 | snap_pref(J, T, map, nent, seen, (ir+1)->op2)); |
| 520 | } | 520 | } |
| 521 | J->slot[snap_slot(sn)] = emitir(ir->ot, op1, op2); | 521 | J->slot[snap_slot(sn)] = emitir(ir->ot & ~(IRT_MARK|IRT_ISPHI), op1, op2); |
| 522 | } else { | 522 | } else { |
| 523 | IRIns *irs; | 523 | IRIns *irs; |
| 524 | TRef tr = emitir(ir->ot, op1, op2); | 524 | TRef tr = emitir(ir->ot, op1, op2); |