Update vm->self location and mark it in vm.c for consistency

Satoshi Tagomori · tagomoris · commit 50c6bd47ef10 · 2025-06-17T10:07:53.000+09:00
diff --git a/gc.c b/gc.c
@@ -3060,7 +3060,6 @@ rb_gc_mark_roots(void *objspace, const char **categoryp)
 
     MARK_CHECKPOINT("vm");
     rb_vm_mark(vm);
-    if (vm->self) gc_mark_internal(vm->self);
 
     MARK_CHECKPOINT("end_proc");
     rb_mark_end_proc();
diff --git a/vm.c b/vm.c
@@ -2982,6 +2982,7 @@ rb_vm_update_references(void *ptr)
     if (ptr) {
         rb_vm_t *vm = ptr;
 
+        vm->self = rb_gc_location(vm->self);
         vm->mark_object_ary = rb_gc_location(vm->mark_object_ary);
         vm->load_path = rb_gc_location(vm->load_path);
         vm->load_path_snapshot = rb_gc_location(vm->load_path_snapshot);
@@ -3068,6 +3069,8 @@ rb_vm_mark(void *ptr)
             rb_gc_mark_maybe(*list->varptr);
         }
 
+        rb_gc_mark_movable(vm->self);
+
         if (vm->main_namespace) {
             rb_namespace_entry_mark((void *)vm->main_namespace);
         }

Original file line number	Diff line number	Diff line change
`@@ -2982,6 +2982,7 @@ rb_vm_update_references(void *ptr)`
`2982`	`2982`	`if (ptr) {`
`2983`	`2983`	`rb_vm_t *vm = ptr;`
`2984`	`2984`
	`2985`	`+ vm->self = rb_gc_location(vm->self);`
`2985`	`2986`	`vm->mark_object_ary = rb_gc_location(vm->mark_object_ary);`
`2986`	`2987`	`vm->load_path = rb_gc_location(vm->load_path);`
`2987`	`2988`	`vm->load_path_snapshot = rb_gc_location(vm->load_path_snapshot);`
`@@ -3068,6 +3069,8 @@ rb_vm_mark(void *ptr)`
`3068`	`3069`	`rb_gc_mark_maybe(*list->varptr);`
`3069`	`3070`	`}`
`3070`	`3071`
	`3072`	`+ rb_gc_mark_movable(vm->self);`
	`3073`	`+`
`3071`	`3074`	`if (vm->main_namespace) {`
`3072`	`3075`	`rb_namespace_entry_mark((void *)vm->main_namespace);`
`3073`	`3076`	`}`