lua

A copy of the Lua development repository
Log | Files | Refs | README

commit 86b39206d998a184a105bfb63b630ed28e1c81bc
parent fdae4b9453fa7432f5b1a88c55dca33f1c861263
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Wed,  3 Oct 2012 09:36:21 -0300

open upvalues cannot be old if thread is not old; when thread is old,
their list is not traversed anymore, and therefore can contain dead
elements.

Diffstat:
Mlfunc.c | 4++--
Mltests.c | 6++----
2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lfunc.c b/lfunc.c @@ -1,5 +1,5 @@ /* -** $Id: lfunc.c,v 2.28 2012/01/20 22:05:50 roberto Exp roberto $ +** $Id: lfunc.c,v 2.29 2012/05/08 13:53:33 roberto Exp roberto $ ** Auxiliary functions to manipulate prototypes and closures ** See Copyright Notice in lua.h */ @@ -52,12 +52,12 @@ UpVal *luaF_findupval (lua_State *L, StkId level) { while (*pp != NULL && (p = gco2uv(*pp))->v >= level) { GCObject *o = obj2gco(p); lua_assert(p->v != &p->u.value); + lua_assert(!isold(o) || isold(obj2gco(L))); if (p->v == level) { /* found a corresponding upvalue? */ if (isdead(g, o)) /* is it dead? */ changewhite(o); /* resurrect it */ return p; } - resetoldbit(o); /* may create a newer upval after this one */ pp = &p->next; } /* not found: create a new one */ diff --git a/ltests.c b/ltests.c @@ -1,5 +1,5 @@ /* -** $Id: ltests.c,v 2.132 2012/07/04 15:52:38 roberto Exp roberto $ +** $Id: ltests.c,v 2.133 2012/08/16 17:34:28 roberto Exp roberto $ ** Internal Module for Debugging of the Lua Implementation ** See Copyright Notice in lua.h */ @@ -469,9 +469,7 @@ int lua_checkmemory (lua_State *L) { lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv); lua_assert(uv->v != &uv->u.value); /* must be open */ lua_assert(!isblack(obj2gco(uv))); /* open upvalues are never black */ - if (isdead(g, obj2gco(uv))) - lua_assert(issweepphase(g)); - else + if (!isdead(g, obj2gco(uv))) checkvalref(g, obj2gco(uv), uv->v); } return 0;