gc.c: Add more assertions around object_id

Author: byroot

gc.c

@@ -1823,7 +1823,7 @@ rb_gc_update_id_to_obj_table(VALUE obj, VALUE id)
 static VALUE
 object_id(VALUE obj)
 {
-    VALUE id;
+    VALUE id = Qfalse;
     rb_shape_t *shape = rb_shape_get_shape(obj);
     unsigned int lock_lev;
 
@@ -1836,6 +1836,8 @@ object_id(VALUE obj)
         st_table *table = ROBJECT_FIELDS_HASH(obj);
         if (rb_shape_has_object_id(shape)) {
             st_lookup(table, (st_data_t)internal_object_id, (st_data_t *)&id);
+            RUBY_ASSERT(id, "object_id missing");
+
             rb_gc_vm_unlock(lock_lev);
             return id;
         }
@@ -1914,11 +1916,11 @@ obj_free_object_id(VALUE obj)
 {
     if (RB_UNLIKELY(id_to_obj_tbl)) {
         if (rb_shape_obj_has_id(obj)) {
-            st_data_t id = (st_data_t)rb_obj_id(obj);
-            GC_ASSERT(id);
+            VALUE obj_id = rb_obj_id(obj);
+            RUBY_ASSERT(FIXNUM_P(obj_id) || RB_TYPE_P(obj, T_BIGNUM));
 
-            if (!st_delete(id_to_obj_tbl, &id, NULL)) {
-                rb_bug("Object ID seen, but not in id_to_obj table: object_id=%llu object=%s", NUM2ULL((VALUE)id), rb_obj_info(obj));
+            if (!st_delete(id_to_obj_tbl, (st_data_t *)&obj_id, NULL)) {
+                rb_bug("Object ID seen, but not in id_to_obj table: object_id=%llu object=%s", NUM2ULL(obj_id), rb_obj_info(obj));
             }
         }
     }
@@ -3690,6 +3692,7 @@ vm_weak_table_id_to_obj_foreach(st_data_t key, st_data_t value, st_data_t data)
             {
                 st_insert(id_to_obj_tbl, key, (st_data_t)new_value);
             }
+            DURING_GC_COULD_MALLOC_REGION_END();
         }
         return ST_CONTINUE;
       }