opensources
/
lua
mirror of https://github.com/lua/lua.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

in generational mode, an emergency collection can turn any object black 

during any memory allocation +
'luaT_getvarargs' may reallocate the stack, and therefore the top must
be correct.
pull/19/head
Roberto Ierusalimschy 6 years ago
parent
15ce8d0904
commit
a314409dba
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lvm.c

6
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.357 2018/06/01 16:51:34 roberto Exp roberto $ ** $Id: lvm.c,v 2.358 2018/06/15 14:14:20 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -712,7 +712,7 @@ static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
ncl->upvals[i] = luaF_findupval(L, base + uv[i].idx); ncl->upvals[i] = luaF_findupval(L, base + uv[i].idx);
else /* get upvalue from enclosing function */ else /* get upvalue from enclosing function */
ncl->upvals[i] = encup[uv[i].idx]; ncl->upvals[i] = encup[uv[i].idx];
/* new closure is white, so we do not need a barrier here */ luaC_objbarrier(L, ncl, ncl->upvals[i]);
} }
if (p->cachemiss >= MAXMISS) /* too many missings? */ if (p->cachemiss >= MAXMISS) /* too many missings? */
p->cache = NULL; /* give up cache */ p->cache = NULL; /* give up cache */
@ -1790,7 +1790,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
} }
vmcase(OP_VARARG) { vmcase(OP_VARARG) {
int n = GETARG_C(i) - 1; /* required results */ int n = GETARG_C(i) - 1; /* required results */
ProtectNT(luaT_getvarargs(L, ci, ra, n)); Protect(luaT_getvarargs(L, ci, ra, n));
vmbreak; vmbreak;
} }
vmcase(OP_PREPVARARG) { vmcase(OP_PREPVARARG) {

Write Preview
Loading…
Cancel
Save