FFI: Fix __gc for VLA/VLS cdata objects.

3 files changed, 8 insertions, 5 deletions

diff --git a/src/lj_cdata.c b/src/lj_cdata.c
index d01cf62a..497b84ee 100644
--- a/src/lj_cdata.c
+++ b/src/lj_cdata.c
@@ -55,7 +55,8 @@ void LJ_FASTCALL lj_cdata_free(global_State *g, GCcdata *cd)
 {
   if (LJ_UNLIKELY(cd->marked & LJ_GC_CDATA_FIN)) {
     GCobj *root;
-    cd->marked = curwhite(g) | LJ_GC_FINALIZED;
+    makewhite(g, obj2gco(cd));
+    obj2gco(cd)->gch.marked |= LJ_GC_FINALIZED;
     if ((root = gcref(g->gc.mmudata)) != NULL) {
       setgcrefr(cd->nextgc, root->gch.nextgc);
       setgcref(root->gch.nextgc, obj2gco(cd));
diff --git a/src/lj_gc.c b/src/lj_gc.c
index 7999e31f..e65f7ffa 100644
--- a/src/lj_gc.c
+++ b/src/lj_gc.c
@@ -34,8 +34,6 @@
 /* Macros to set GCobj colors and flags. */
 #define white2gray(x)           ((x)->gch.marked &= (uint8_t)~LJ_GC_WHITES)
 #define gray2black(x)           ((x)->gch.marked |= LJ_GC_BLACK)
-#define makewhite(g, x) \
-  ((x)->gch.marked = ((x)->gch.marked & (uint8_t)~LJ_GC_COLORS) | curwhite(g))
 #define isfinalized(u)          ((u)->marked & LJ_GC_FINALIZED)
 #define markfinalized(u)        ((u)->marked |= LJ_GC_FINALIZED)
 
@@ -500,7 +498,8 @@ static void gc_finalize(lua_State *L)
     /* Add cdata back to the GC list and make it white. */
     setgcrefr(o->gch.nextgc, g->gc.root);
     setgcref(g->gc.root, o);
-    o->gch.marked = curwhite(g);
+    makewhite(g, o);
+    o->gch.marked &= (uint8_t)~LJ_GC_CDATA_FIN;
     /* Resolve finalizer. */
     setcdataV(L, &tmp, gco2cd(o));
     tv = lj_tab_set(L, ctype_ctsG(g)->finalizer, &tmp);
@@ -544,7 +543,8 @@ void lj_gc_finalize_cdata(lua_State *L)
       if (!tvisnil(&node[i].val) && tviscdata(&node[i].key)) {
         GCobj *o = gcV(&node[i].key);
         TValue tmp;
-        o->gch.marked = curwhite(g);
+        makewhite(g, o);
+        o->gch.marked &= (uint8_t)~LJ_GC_CDATA_FIN;
         copyTV(L, &tmp, &node[i].val);
         setnilV(&node[i].val);
         gc_call_finalizer(g, L, &tmp, o);
diff --git a/src/lj_gc.h b/src/lj_gc.h
index ec1a9643..dd7f87ba 100644
--- a/src/lj_gc.h
+++ b/src/lj_gc.h
@@ -38,6 +38,8 @@ enum {
 
 #define curwhite(g)     ((g)->gc.currentwhite & LJ_GC_WHITES)
 #define newwhite(g, x)  (obj2gco(x)->gch.marked = (uint8_t)curwhite(g))
+#define makewhite(g, x) \
+  ((x)->gch.marked = ((x)->gch.marked & (uint8_t)~LJ_GC_COLORS) | curwhite(g))
 #define flipwhite(x)    ((x)->gch.marked ^= LJ_GC_WHITES)
 #define black2gray(x)   ((x)->gch.marked &= (uint8_t)~LJ_GC_BLACK)
 #define fixstring(s)    ((s)->marked |= LJ_GC_FIXED)