lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua 5.3.2 bugfix,see http://lua-users.org/lists/lua-l/2016-01/msg00000.html

Browse Source
This commit is contained in:
Cloud Wu
2016-01-04 15:57:03 +08:00
parent fca4d67a43
commit 141a4d0992
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
3rd/lua/lvm.c
View File

@@ -200,18 +200,19 @@ void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
for (loop = 0; loop < MAXTAGLOOP; loop++) { for (loop = 0; loop < MAXTAGLOOP; loop++) {
const TValue *tm; const TValue *tm;
if (oldval != NULL) { if (oldval != NULL) {
lua_assert(ttistable(t) && ttisnil(oldval)); Table *h = hvalue(t);
lua_assert(ttisnil(oldval));
/* must check the metamethod */ /* must check the metamethod */
if ((tm = fasttm(L, hvalue(t)->metatable, TM_NEWINDEX)) == NULL && if ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
/* no metamethod; is there a previous entry in the table? */ /* no metamethod; is there a previous entry in the table? */
(oldval != luaO_nilobject || (oldval != luaO_nilobject ||
/* no previous entry; must create one. (The next test is /* no previous entry; must create one. (The next test is
always true; we only need the assignment.) */ always true; we only need the assignment.) */
(oldval = luaH_newkey(L, hvalue(t), key), 1))) { (oldval = luaH_newkey(L, h, key), 1))) {
/* no metamethod and (now) there is an entry with given key */ /* no metamethod and (now) there is an entry with given key */
setobj2t(L, cast(TValue *, oldval), val); setobj2t(L, cast(TValue *, oldval), val);
invalidateTMcache(hvalue(t)); invalidateTMcache(h);
luaC_barrierback(L, hvalue(t), val); luaC_barrierback(L, h, val);
return; return;
} }
/* else will try the metamethod */ /* else will try the metamethod */