Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2018-04-22 13:30:02 +02:00
commit a90e7795ca

View File

@ -1879,6 +1879,8 @@ void LJ_FASTCALL lj_crecord_tonumber(jit_State *J, RecordFFData *rd)
d = ctype_get(cts, CTID_DOUBLE); d = ctype_get(cts, CTID_DOUBLE);
J->base[0] = crec_ct_tv(J, d, 0, J->base[0], &rd->argv[0]); J->base[0] = crec_ct_tv(J, d, 0, J->base[0], &rd->argv[0]);
} else { } else {
/* Specialize to the ctype that couldn't be converted. */
argv2cdata(J, J->base[0], &rd->argv[0]);
J->base[0] = TREF_NIL; J->base[0] = TREF_NIL;
} }
} }