From af3ca3bb2f06652508ef7ed95c3022cfea93e884 Mon Sep 17 00:00:00 2001 From: Cloud Wu Date: Tue, 28 Oct 2014 19:40:27 +0800 Subject: [PATCH] merge lua bugfix, read http://www.lua.org/bugs.html --- 3rd/lua/lgc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rd/lua/lgc.c b/3rd/lua/lgc.c index c0f2858c..51c11f5b 100644 --- a/3rd/lua/lgc.c +++ b/3rd/lua/lgc.c @@ -403,7 +403,7 @@ static int traverseephemeron (global_State *g, Table *h) { reallymarkobject(g, gcvalue(gval(n))); /* mark it now */ } } - if (prop) + if (g->gcstate != GCSatomic || prop) linktable(h, &g->ephemeron); /* have to propagate again */ else if (hasclears) /* does table have white keys? */ linktable(h, &g->allweak); /* may have to clean white keys */