Merge branch 'master' into v2.1

1 files changed, 3 insertions, 0 deletions

diff --git a/src/lj_gc.c b/src/lj_gc.c
index c3a0c258..eebc751b 100644
--- a/src/lj_gc.c
+++ b/src/lj_gc.c
@@ -108,6 +108,9 @@ static void gc_mark_start(global_State *g)
   gc_markobj(g, tabref(mainthread(g)->env));
   gc_marktv(g, &g->registrytv);
   gc_mark_gcroot(g);
+#if LJ_HASFFI
+  if (ctype_ctsG(g)) gc_markobj(g, ctype_ctsG(g)->finalizer);
+#endif
   g->gc.state = GCSpropagate;
 }