Compare commits

..

No commits in common. "e76bb50d44702f601ec5dd167b03b475ed53860c" and "85c3f2fb6f59276ebf07312859a69d6d5a897f62" have entirely different histories.

2 changed files with 2 additions and 6 deletions

View File

@ -108,9 +108,8 @@ LUALIB_API int luaL_loadfilex(lua_State *L, const char *filename,
copyTV(L, L->top-1, L->top); copyTV(L, L->top-1, L->top);
} }
if (err) { if (err) {
const char *fname = filename ? filename : "stdin";
L->top--; L->top--;
lua_pushfstring(L, "cannot read %s: %s", fname, strerror(err)); lua_pushfstring(L, "cannot read %s: %s", chunkname+1, strerror(err));
return LUA_ERRFILE; return LUA_ERRFILE;
} }
return status; return status;

View File

@ -854,10 +854,7 @@ int lj_record_mm_lookup(jit_State *J, RecordIndex *ix, MMS mm)
return 0; /* No metamethod. */ return 0; /* No metamethod. */
} }
/* The cdata metatable is treated as immutable. */ /* The cdata metatable is treated as immutable. */
if (LJ_HASFFI && tref_iscdata(ix->tab)) { if (LJ_HASFFI && tref_iscdata(ix->tab)) goto immutable_mt;
mix.tab = TREF_NIL;
goto immutable_mt;
}
ix->mt = mix.tab = lj_ir_ktab(J, mt); ix->mt = mix.tab = lj_ir_ktab(J, mt);
goto nocheck; goto nocheck;
} }