gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFI: Equality comparisons never raise an error.

Browse Source
This commit is contained in:
Mike Pall 2012-05-23 22:19:05 +02:00
parent f3197046b8
commit 3a43ea5084
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ext_ffi_semantics.html
View File

@ -724,6 +724,11 @@ of them is an <tt>uint64_t</tt>, the other side is converted to an
both sides are converted to an <tt>int64_t</tt> and a signed both sides are converted to an <tt>int64_t</tt> and a signed
comparison is performed.</li> comparison is performed.</li>
<li><b>Comparisons for equality/inequality</b> never raise an error.
Even incompatible pointers can be compared for equality by address. Any
other incompatible comparison (also with non-cdata objects) treats the
two sides as unequal.</li>
</ul> </ul>
<h3 id="cdata_key">cdata objects as table keys</h3> <h3 id="cdata_key">cdata objects as table keys</h3>

4
src/lj_carith.c
View File

@ -205,6 +205,10 @@ static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
if (!tv) { if (!tv) {
const char *repr[2]; const char *repr[2];
int i; int i;
if (mm == MM_eq) { /* Equality checks never raise an error. */
setboolV(L->top-1, 0);
return 1;
}
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (ca->ct[i]) if (ca->ct[i])
repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca->ct[i]), NULL)); repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca->ct[i]), NULL));

16
src/lj_crecord.c
View File

@ -1073,13 +1073,17 @@ static void crec_arith_meta(jit_State *J, CTState *cts, RecordFFData *rd)
tv = lj_ctype_meta(cts, argv2cdata(J, J->base[1], &rd->argv[1])->typeid, tv = lj_ctype_meta(cts, argv2cdata(J, J->base[1], &rd->argv[1])->typeid,
(MMS)rd->data); (MMS)rd->data);
} }
if (tv && tvisfunc(tv)) { if (tv) {
J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME; if (tvisfunc(tv)) {
rd->nres = -1; /* Pending tailcall. */ J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME;
} else { rd->nres = -1; /* Pending tailcall. */
/* NYI: non-function metamethods. */ return;
lj_trace_err(J, LJ_TRERR_BADTYPE); } /* NYI: non-function metamethods. */
} else if ((MMS)rd->data == MM_eq) {
J->base[0] = TREF_FALSE;
return;
} }
lj_trace_err(J, LJ_TRERR_BADTYPE);
} }
void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd) void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)