Copying GC support for EXIVAR

Author: wks

gc.c

@@ -10425,6 +10425,10 @@ gc_update_object_references(rb_objspace_t *objspace, VALUE obj)
 
     gc_report(4, objspace, "update-refs: %p ->\n", (void *)obj);
 
+    if (FL_TEST(obj, FL_EXIVAR)) {
+        rb_update_generic_ivar(obj);
+    }
+
     switch (BUILTIN_TYPE(obj)) {
       case T_CLASS:
       case T_MODULE:

internal/variable.h

@@ -42,6 +42,7 @@ int rb_gen_ivtbl_get(VALUE obj, ID id, struct gen_ivtbl **ivtbl);
 RUBY_SYMBOL_EXPORT_BEGIN
 /* variable.c (export) */
 void rb_mark_generic_ivar(VALUE);
+void rb_update_generic_ivar(VALUE);
 void rb_mv_generic_ivar(VALUE src, VALUE dst);
 VALUE rb_const_missing(VALUE klass, VALUE name);
 int rb_class_ivar_set(VALUE klass, ID vid, VALUE value);

variable.c

@@ -1034,7 +1034,7 @@ gen_ivtbl_mark(const struct gen_ivtbl *ivtbl)
     uint32_t i;
 
     for (i = 0; i < ivtbl->numiv; i++) {
-        rb_gc_mark(ivtbl->ivptr[i]);
+        rb_gc_mark_movable(ivtbl->ivptr[i]);
     }
 }
 
@@ -1048,6 +1048,26 @@ rb_mark_generic_ivar(VALUE obj)
     }
 }
 
+static void
+gen_ivtbl_update(struct gen_ivtbl *ivtbl)
+{
+    uint32_t i;
+
+    for (i = 0; i < ivtbl->numiv; i++) {
+        ivtbl->ivptr[i] = rb_gc_location(ivtbl->ivptr[i]);
+    }
+}
+
+void
+rb_update_generic_ivar(VALUE obj)
+{
+    struct gen_ivtbl *ivtbl;
+
+    if (rb_gen_ivtbl_get(obj, 0, &ivtbl)) {
+        gen_ivtbl_update(ivtbl);
+    }
+}
+
 void
 rb_mv_generic_ivar(VALUE rsrc, VALUE dst)
 {