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 | luajit-6e5c872eb795279f0fde845937eb120d8c128add.tar.gz luajit-6e5c872eb795279f0fde845937eb120d8c128add.tar.bz2 luajit-6e5c872eb795279f0fde845937eb120d8c128add.zip | |
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) | |||
| 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; | ||
| 906 | if (ctype_isbool(ctr->info)) { | 905 | if (ctype_isbool(ctr->info)) { |
| 907 | if (frame_islua(J->L->base-1) && bc_b(frame_pc(J->L->base-1)[-1]) == 1) | 906 | 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. */ | 907 | /* Don't check result if ignored. */ |
| 909 | crec_snap_caller(J); | 908 | tr = TREF_NIL; |
| 910 | lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0)); | 909 | } else { |
| 911 | J->postproc = LJ_POST_FIXGUARDSNAP; | 910 | crec_snap_caller(J); |
| 912 | tr = TREF_TRUE; | 911 | lj_ir_set(J, IRTGI(IR_NE), tr, lj_ir_kint(J, 0)); |
| 912 | J->postproc = LJ_POST_FIXGUARDSNAP; | ||
| 913 | tr = TREF_TRUE; | ||
| 914 | } | ||
| 913 | } else if (t == IRT_FLOAT || t == IRT_U32) { | 915 | } else if (t == IRT_FLOAT || t == IRT_U32) { |
| 914 | tr = emitconv(tr, IRT_NUM, t, 0); | 916 | tr = emitconv(tr, IRT_NUM, t, 0); |
| 915 | } else if (t == IRT_I8 || t == IRT_I16) { | 917 | } else if (t == IRT_I8 || t == IRT_I16) { |
| @@ -923,6 +925,7 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd) | |||
| 923 | if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J); | 925 | if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J); |
| 924 | } | 926 | } |
| 925 | J->base[0] = tr; | 927 | J->base[0] = tr; |
| 928 | J->needsnap = 1; | ||
| 926 | return 1; | 929 | return 1; |
| 927 | } | 930 | } |
| 928 | return 0; | 931 | return 0; |