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

FFI: Check for __new metamethod when calling a constructor.

Browse Source
This commit is contained in:
Mike Pall
2012-06-20 18:24:49 +02:00
parent e9e45313e7
commit 8b71ab1080
4 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/lj_crecord.c
View File

@@ -941,30 +941,36 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd)
return 0;
}
/* Record ctype call metamethod. */
static void crec_call_meta(jit_State *J, RecordFFData *rd, CTypeID id)
{
CTState *cts = ctype_ctsG(J2G(J));
CType *ct = ctype_raw(cts, id);
cTValue *tv;
if (ctype_isptr(ct->info)) id = ctype_cid(ct->info);
tv = lj_ctype_meta(cts, id, MM_call);
if (tv && tvisfunc(tv)) {
J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME;
rd->nres = -1; /* Pending tailcall. */
} else {
/* NYI: non-function metamethods. */
lj_trace_err(J, LJ_TRERR_BADTYPE);
}
}
void LJ_FASTCALL recff_cdata_call(jit_State *J, RecordFFData *rd)
{
CTState *cts = ctype_ctsG(J2G(J));
GCcdata *cd = argv2cdata(J, J->base[0], &rd->argv[0]);
if (cd->typeid == CTID_CTYPEID)
crec_alloc(J, rd, crec_constructor(J, cd, J->base[0]));
else if (!crec_call(J, rd, cd))
crec_call_meta(J, rd, cd->typeid);
CTypeID id = cd->typeid;
CType *ct;
cTValue *tv;
MMS mm = MM_call;
if (id == CTID_CTYPEID) {
id = crec_constructor(J, cd, J->base[0]);
mm = MM_new;
} else if (crec_call(J, rd, cd)) {
return;
}
/* Record ctype __call/__new metamethod. */
ct = ctype_raw(cts, id);
if (ctype_isptr(ct->info)) id = ctype_cid(ct->info);
tv = lj_ctype_meta(cts, id, mm);
if (tv) {
if (tvisfunc(tv)) {
J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME;
rd->nres = -1; /* Pending tailcall. */
return;
}
} else if (mm == MM_new) {
crec_alloc(J, rd, id);
return;
}
/* No metamethod or NYI: non-function metamethods. */
lj_trace_err(J, LJ_TRERR_BADTYPE);
}
static TRef crec_arith_int64(jit_State *J, TRef *sp, CType **s, MMS mm)