修复合并错误

Author: actboy168

3rd/lua/lua-latest/lcode.c

@@ -985,7 +985,7 @@ void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
 ** or it is a constant.
 */
 void luaK_exp2val (FuncState *fs, expdesc *e) {
-  if (hasjumps(e))
+  if (e->k == VJMP || hasjumps(e))
     luaK_exp2anyreg(fs, e);
   else
     luaK_dischargevars(fs, e);

3rd/lua/lua-latest/lstate.c

@@ -342,8 +342,10 @@ int luaE_resetthread (lua_State *L, int status) {
 LUA_API int lua_closethread (lua_State *L, lua_State *from) {
   int status;
   lua_lock(L);
+  luai_threadcall(L, from);
   L->nCcalls = (from) ? getCcalls(from) : 0;
   status = luaE_resetthread(L, L->status);
+  luai_threadret(from, L);
   lua_unlock(L);
   return status;
 }

3rd/lua/lua54/lstate.c

@@ -342,8 +342,10 @@ int luaE_resetthread (lua_State *L, int status) {
 LUA_API int lua_closethread (lua_State *L, lua_State *from) {
   int status;
   lua_lock(L);
+  luai_threadcall(L, from);
   L->nCcalls = (from) ? getCcalls(from) : 0;
   status = luaE_resetthread(L, L->status);
+  luai_threadret(from, L);
   lua_unlock(L);
   return status;
 }