WIP

Author: byroot

gc/default/default.c

@@ -5461,7 +5461,12 @@ gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src)
     uint32_t orig_shape, new_shape;
     VALUE dest = rb_gc_impl_location(objspace, src);
 
-    new_shape = orig_shape = rb_gc_get_shape(src);
+    if (RB_TYPE_P(src, T_IMEMO)) {
+        new_shape = orig_shape = 0;
+    }
+    else {
+        new_shape = orig_shape = rb_gc_get_shape(src);
+    }
 
     if (RB_TYPE_P(src, T_OBJECT)) {
         if (dest_pool != heap) {
@@ -5470,14 +5475,6 @@ gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src)
         }
     }
 
-    if (FL_TEST_RAW(src, RUBY_FL_ADDRESS_SEEN) && !rb_shape_has_old_address(new_shape)) {
-        DURING_GC_COULD_MALLOC_REGION_START();
-        {
-            rb_obj_field_set(dest, rb_shape_transition_old_address(new_shape), 0, src);
-        }
-        DURING_GC_COULD_MALLOC_REGION_END();
-    }
-
     while (!try_move(objspace, dest_pool, dest_pool->free_pages, src)) {
         struct gc_sweep_context ctx = {
             .page = dest_pool->sweeping_page,
@@ -5503,6 +5500,15 @@ gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src)
         }
     }
 
+    if (FL_TEST_RAW(dest, RUBY_FL_ADDRESS_SEEN) && !rb_shape_has_old_address(new_shape)) {
+        DURING_GC_COULD_MALLOC_REGION_START();
+        {
+            new_shape = rb_shape_transition_old_address(new_shape);
+            rb_obj_field_set(dest, new_shape, 0, src);
+        }
+        DURING_GC_COULD_MALLOC_REGION_END();
+    }
+
     if (new_shape != orig_shape) {
         rb_gc_set_shape(dest, new_shape);
     }
@@ -6168,6 +6174,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
     if (RVALUE_MARKED(objspace, obj)) SET_ENTRY(marked, Qtrue);
     if (RVALUE_PINNED(objspace, obj)) SET_ENTRY(pinned, Qtrue);
     if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (FL_TEST_RAW(obj, RUBY_FL_ADDRESS_SEEN)) SET_ENTRY(address_seen, Qtrue);
     if (FL_TEST(obj, FL_SHAREABLE)) SET_ENTRY(shareable, Qtrue);
 
     object_metadata_entries[n].name = 0;

gc/mmtk/mmtk.c

@@ -1221,7 +1221,6 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
 } while (0)
 
     if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
-    if (FL_TEST_RAW(obj, RUBY_FL_ADDRESS_SEEN)) SET_ENTRY(address_seen, Qtrue)
 
     object_metadata_entries[n].name = 0;
     object_metadata_entries[n].val = 0;

shape.c

@@ -760,7 +760,7 @@ rb_shape_object_id(shape_id_t original_shape_id)
 shape_id_t
 rb_shape_old_address(shape_id_t original_shape_id)
 {
-    RUBY_ASSERT(rb_shape_has_object_id(original_shape_id));
+    RUBY_ASSERT(rb_shape_has_old_address(original_shape_id));
 
     rb_shape_t *shape = RSHAPE(original_shape_id);
     while (shape->type != SHAPE_OLD_ADDRESS) {

variable.c

@@ -1269,7 +1269,7 @@ VALUE
 rb_obj_field_get(VALUE obj, shape_id_t target_shape_id)
 {
     RUBY_ASSERT(!SPECIAL_CONST_P(obj));
-    RUBY_ASSERT(RSHAPE_TYPE_P(target_shape_id, SHAPE_IVAR) || RSHAPE_TYPE_P(target_shape_id, SHAPE_OBJ_ID));
+    RUBY_ASSERT(RSHAPE_EDGE_NAME(target_shape_id));
 
     if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
         ASSERT_vm_locking();