Merge branch 'master' into v2.1

2024-03-10 17:26:03 +01:00
parent 0d313b2431 cae361187e
commit 913df6a945
3 changed files with 7 additions and 1 deletions
--- 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;
 }