diff options
| author | Mike Pall <mike> | 2012-05-09 16:25:51 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-05-09 16:25:51 +0200 |
| commit | 6e5c872eb795279f0fde845937eb120d8c128add (patch) | |
| tree | 050b3b8c3b528349d875317c6834eed70d197d48 /src/lj_crecord.c | |
| parent | 7d3954036ca7e58b48a3e72a4a814735b7138fdf (diff) | |
| download | luajit2-6e5c872eb795279f0fde845937eb120d8c128add.tar.gz | |
FFI: Fix recording of test for bool result of call.
Diffstat (limited to 'src/lj_crecord.c')
| -rw-r--r-- | src/lj_crecord.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lj_crecord.c b/src/lj_crecord.c index 9b780212..81ab3540 100644 --- a/src/lj_crecord.c +++ b/src/lj_crecord.c @@ -902,14 +902,16 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd) func = emitir(IRT(IR_CARG, IRT_NIL), func, lj_ir_kint(J, ctype_typeid(cts, ct))); tr = emitir(IRT(IR_CALLXS, t), crec_call_args(J, rd, cts, ct), func); - J->needsnap = 1; if (ctype_isbool(ctr->info)) { - if (frame_islua(J->L->base-1) && bc_b(frame_pc(J->L->base-1)[-1]) == 1) - return 1; /* Don't check result if ignored. */ - crec_snap_caller(J); - lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0)); - J->postproc = LJ_POST_FIXGUARDSNAP; - tr = TREF_TRUE; + if (frame_islua(J->L->base-1) && bc_b(frame_pc(J->L->base-1)[-1]) == 1) { + /* Don't check result if ignored. */ + tr = TREF_NIL; + } else { + crec_snap_caller(J); + lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0)); + J->postproc = LJ_POST_FIXGUARDSNAP; + tr = TREF_TRUE; + } } else if (t == IRT_FLOAT || t == IRT_U32) { tr = emitconv(tr, IRT_NUM, t, 0); } else if (t == IRT_I8 || t == IRT_I16) { @@ -923,6 +925,7 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd) if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J); } J->base[0] = tr; + J->needsnap = 1; return 1; } return 0; |