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

Fix recording of getmetatable() for non-tables.

Browse Source
This commit is contained in:
Mike Pall 2010-03-09 17:49:13 +01:00
parent 6e6034e809
commit f49649d005
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_record.c
View File

@ -660,9 +660,11 @@ static int rec_mm_lookup(jit_State *J, RecordIndex *ix, MMS mm)
} else { } else {
/* Specialize to base metatable. Must flush mcode in lua_setmetatable(). */ /* Specialize to base metatable. Must flush mcode in lua_setmetatable(). */
mt = tabref(basemt_obj(J2G(J), &ix->tabv)); mt = tabref(basemt_obj(J2G(J), &ix->tabv));
if (mt == NULL) if (mt == NULL) {
ix->mt = TREF_NIL;
return 0; /* No metamethod. */ return 0; /* No metamethod. */
mix.tab = lj_ir_ktab(J, mt); }
ix->mt = mix.tab = lj_ir_ktab(J, mt);
goto nocheck; goto nocheck;
} }
ix->mt = mt ? mix.tab : TREF_NIL; ix->mt = mt ? mix.tab : TREF_NIL;
@ -1160,7 +1162,7 @@ static void LJ_FASTCALL recff_type(jit_State *J, RecordFFData *rd)
static void LJ_FASTCALL recff_getmetatable(jit_State *J, RecordFFData *rd) static void LJ_FASTCALL recff_getmetatable(jit_State *J, RecordFFData *rd)
{ {
TRef tr = J->base[0]; TRef tr = J->base[0];
if (tref_istab(tr)) { if (tr) {
RecordIndex ix; RecordIndex ix;
ix.tab = tr; ix.tab = tr;
copyTV(J->L, &ix.tabv, &rd->argv[0]); copyTV(J->L, &ix.tabv, &rd->argv[0]);