Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2016-09-19 21:19:07 +02:00
commit 1a9a264356

View File

@ -140,7 +140,9 @@ GCfunc *lj_func_newL_empty(lua_State *L, GCproto *pt, GCtab *env)
/* NOBARRIER: The GCfunc is new (marked white). */ /* NOBARRIER: The GCfunc is new (marked white). */
for (i = 0; i < nuv; i++) { for (i = 0; i < nuv; i++) {
GCupval *uv = func_emptyuv(L); GCupval *uv = func_emptyuv(L);
uv->dhash = (uint32_t)(uintptr_t)pt ^ ((uint32_t)proto_uv(pt)[i] << 24); int32_t v = proto_uv(pt)[i];
uv->immutable = ((v / PROTO_UV_IMMUTABLE) & 1);
uv->dhash = (uint32_t)(uintptr_t)pt ^ (v << 24);
setgcref(fn->l.uvptr[i], obj2gco(uv)); setgcref(fn->l.uvptr[i], obj2gco(uv));
} }
fn->l.nupvalues = (uint8_t)nuv; fn->l.nupvalues = (uint8_t)nuv;