diff options
| author | Mike Pall <mike> | 2013-05-23 22:20:07 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-23 22:20:07 +0200 |
| commit | b3369f3c95a11a8c451b244a2da69f1c3aee31c4 (patch) | |
| tree | 06bfdf8975a0722c18bf625b9f2f4895d977a846 /src/lj_snap.c | |
| parent | 55772e3ad9c36f6ee789611c35615e93c358aca9 (diff) | |
| parent | 2c3e80d4fd3dd7a81e2691c9facff594cf44de0f (diff) | |
| download | luajit-b3369f3c95a11a8c451b244a2da69f1c3aee31c4.tar.gz luajit-b3369f3c95a11a8c451b244a2da69f1c3aee31c4.tar.bz2 luajit-b3369f3c95a11a8c451b244a2da69f1c3aee31c4.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_snap.c')
| -rw-r--r-- | src/lj_snap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index aea6102c..30ff9152 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
| @@ -564,6 +564,8 @@ void lj_snap_replay(jit_State *J, GCtrace *T) | |||
| 564 | continue; | 564 | continue; |
| 565 | } | 565 | } |
| 566 | tmp = emitir(irs->ot, tmp, val); | 566 | tmp = emitir(irs->ot, tmp, val); |
| 567 | } else if (LJ_HASFFI && irs->o == IR_XBAR && ir->o == IR_CNEW) { | ||
| 568 | emitir(IRT(IR_XBAR, IRT_NIL), 0, 0); | ||
| 567 | } | 569 | } |
| 568 | } | 570 | } |
| 569 | } | 571 | } |