aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2012-05-08 18:57:20 +0200
committerMike Pall <mike>2012-05-08 18:59:51 +0200
commit7d3954036ca7e58b48a3e72a4a814735b7138fdf (patch)
treea03802cdcf39fd63b711c99dabdd3a4c129eac23
parent886a450a3d3b47ebffb2b21334b872ebedf1e3c8 (diff)
downloadluajit-7d3954036ca7e58b48a3e72a4a814735b7138fdf.tar.gz
luajit-7d3954036ca7e58b48a3e72a4a814735b7138fdf.tar.bz2
luajit-7d3954036ca7e58b48a3e72a4a814735b7138fdf.zip
FFI: Don't record test for bool result of call, if ignored.
-rw-r--r--src/lj_crecord.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index 1b65c110..9b780212 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -902,7 +902,10 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd)
902 func = emitir(IRT(IR_CARG, IRT_NIL), func, 902 func = emitir(IRT(IR_CARG, IRT_NIL), func,
903 lj_ir_kint(J, ctype_typeid(cts, ct))); 903 lj_ir_kint(J, ctype_typeid(cts, ct)));
904 tr = emitir(IRT(IR_CALLXS, t), crec_call_args(J, rd, cts, ct), func); 904 tr = emitir(IRT(IR_CALLXS, t), crec_call_args(J, rd, cts, ct), func);
905 J->needsnap = 1;
905 if (ctype_isbool(ctr->info)) { 906 if (ctype_isbool(ctr->info)) {
907 if (frame_islua(J->L->base-1) && bc_b(frame_pc(J->L->base-1)[-1]) == 1)
908 return 1; /* Don't check result if ignored. */
906 crec_snap_caller(J); 909 crec_snap_caller(J);
907 lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0)); 910 lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0));
908 J->postproc = LJ_POST_FIXGUARDSNAP; 911 J->postproc = LJ_POST_FIXGUARDSNAP;
@@ -920,7 +923,6 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd)
920 if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J); 923 if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J);
921 } 924 }
922 J->base[0] = tr; 925 J->base[0] = tr;
923 J->needsnap = 1;
924 return 1; 926 return 1;
925 } 927 }
926 return 0; 928 return 0;