DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FFI: Allow non-scalar cdata to be compared for equality by address.

Browse Source
This commit is contained in:
Mike Pall
2014-04-01 00:30:22 +02:00
parent c735293921
commit 19b69f21d4
2 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_carith.c
View File

@@ -73,7 +73,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
ok = 1;
} else {
ca->ct[1-i] = ct; /* Use enum to improve error message. */
ca->p[1-i] = NULL;
ca->p[1-i] = (void *)(intptr_t)1; /* To make it unequal. */
break;
}
}
@@ -234,7 +234,9 @@ static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
const char *repr[2];
int i, isenum = -1, isstr = -1;
if (mm == MM_eq) { /* Equality checks never raise an error. */
setboolV(L->top-1, 0);
int eq = ca->p[0] == ca->p[1];
setboolV(L->top-1, eq);
setboolV(&G(L)->tmptv2, eq); /* Remember for trace recorder. */
return 1;
}
for (i = 0; i < 2; i++) {