WIP

Author: byroot

gc.c

@@ -1912,16 +1912,12 @@ object_id_to_ref(void *objspace_ptr, VALUE object_id)
 static inline void
 obj_free_object_id(VALUE obj)
 {
-    if (FL_TEST_RAW(obj, RUBY_FL_UNUSED9)) {
-        rb_bug("already freed that object_id %s", rb_obj_info(obj));
-    }
-    else {
-        FL_SET_RAW(obj, RUBY_FL_UNUSED9);
-    }
-
     if (RB_UNLIKELY(id_to_obj_tbl)) {
         if (rb_shape_obj_has_id(obj)) {
             VALUE obj_id = rb_obj_id(obj);
+            if (!FIXNUM_P(obj_id)) {
+                rb_bug("Corrupted object_id=%s obj=%s", rb_obj_info(obj_id), rb_obj_info(obj));
+            }
             st_data_t id = (st_data_t)obj_id;
             GC_ASSERT(id);
 
@@ -1935,6 +1931,13 @@ obj_free_object_id(VALUE obj)
 void
 rb_gc_obj_free_vm_weak_references(VALUE obj)
 {
+    if (FL_TEST_RAW(obj, RUBY_FL_UNUSED9)) {
+        rb_bug("already freed that object %s", rb_obj_info(obj));
+    }
+    else {
+        FL_SET_RAW(obj, RUBY_FL_UNUSED9);
+    }
+
     obj_free_object_id(obj);
 
     if (FL_TEST(obj, FL_EXIVAR)) {