diff options
author | Mike Pall <mike> | 2017-03-08 22:03:17 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2017-03-08 22:03:17 +0100 |
commit | 3ab9f5a18da06b06ebf1e4487997c25e32210dfe (patch) | |
tree | 730950bc84c1d336b3b844434c1f24cf9d6eafcb | |
parent | eef77a6d775147a1b581b06c296e9f2b3ebc9d2b (diff) | |
download | luajit2-3ab9f5a18da06b06ebf1e4487997c25e32210dfe.tar.gz |
Remove internal __mode = "K" and replace with safe check.
-rw-r--r-- | src/lib_ffi.c | 2 | ||||
-rw-r--r-- | src/lj_gc.c | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/lib_ffi.c b/src/lib_ffi.c index 6a93ce97..f2f2ede4 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c @@ -811,7 +811,7 @@ static GCtab *ffi_finalizer(lua_State *L) settabV(L, L->top++, t); setgcref(t->metatable, obj2gco(t)); setstrV(L, lj_tab_setstr(L, t, lj_str_newlit(L, "__mode")), - lj_str_newlit(L, "K")); + lj_str_newlit(L, "k")); t->nomm = (uint8_t)(~(1u<<MM_mode)); return t; } diff --git a/src/lj_gc.c b/src/lj_gc.c index aa243d13..a5d32ea3 100644 --- a/src/lj_gc.c +++ b/src/lj_gc.c @@ -168,12 +168,19 @@ static int gc_traverse_tab(global_State *g, GCtab *t) while ((c = *modestr++)) { if (c == 'k') weak |= LJ_GC_WEAKKEY; else if (c == 'v') weak |= LJ_GC_WEAKVAL; - else if (c == 'K') weak = (int)(~0u & ~LJ_GC_WEAKVAL); } - if (weak > 0) { /* Weak tables are cleared in the atomic phase. */ - t->marked = (uint8_t)((t->marked & ~LJ_GC_WEAK) | weak); - setgcrefr(t->gclist, g->gc.weak); - setgcref(g->gc.weak, obj2gco(t)); + if (weak) { /* Weak tables are cleared in the atomic phase. */ +#if LJ_HASFFI + CTState *cts = ctype_ctsG(g); + if (cts && cts->finalizer == t) { + weak = (int)(~0u & ~LJ_GC_WEAKVAL); + } else +#endif + { + t->marked = (uint8_t)((t->marked & ~LJ_GC_WEAK) | weak); + setgcrefr(t->gclist, g->gc.weak); + setgcref(g->gc.weak, obj2gco(t)); + } } } if (weak == LJ_GC_WEAK) /* Nothing to mark if both keys/values are weak. */ |