shape.c: make internal_object_id extern instead of static

Otherwise every inclusion of shape.h result in a different variable
and only the one in `shape.c` is properly initialized.

Author: byroot

gc.c

@@ -1835,7 +1835,7 @@ object_id(VALUE obj)
     if (rb_shape_too_complex_p(shape)) {
         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);
+            st_lookup(table, (st_data_t)ruby_internal_object_id, (st_data_t *)&id);
             RUBY_ASSERT(id, "object_id missing");
 
             rb_gc_vm_unlock(lock_lev);
@@ -1845,7 +1845,7 @@ object_id(VALUE obj)
         id = ULL2NUM(next_object_id);
         next_object_id += OBJ_ID_INCREMENT;
         rb_shape_t *object_id_shape = rb_shape_object_id_shape(obj);
-        st_insert(table, (st_data_t)internal_object_id, (st_data_t)id);
+        st_insert(table, (st_data_t)ruby_internal_object_id, (st_data_t)id);
         rb_shape_set_shape(obj, object_id_shape);
         if (RB_UNLIKELY(id_to_obj_tbl)) {
             st_insert(id_to_obj_tbl, (st_data_t)id, (st_data_t)obj);

object.c

@@ -341,7 +341,7 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
         // obj is TOO_COMPLEX so we can copy its iv_hash
         st_table *table = st_copy(ROBJECT_FIELDS_HASH(obj));
         if (rb_shape_has_object_id(src_shape)) {
-            st_data_t id = (st_data_t)internal_object_id;
+            st_data_t id = (st_data_t)ruby_internal_object_id;
             st_delete(table, &id, NULL);
         }
         rb_obj_init_too_complex(dest, table);

shape.c

@@ -47,6 +47,7 @@
 
 static ID id_frozen;
 static ID id_t_object;
+ID ruby_internal_object_id; // extern
 
 #define LEAF 0
 #define BLACK 0x0
@@ -732,7 +733,7 @@ shape_transition_too_complex(rb_shape_t *original_shape)
 
     if (original_shape->flags & SHAPE_FL_HAS_OBJECT_ID) {
         bool dont_care;
-        next_shape = get_next_shape_internal(next_shape, internal_object_id, SHAPE_OBJ_ID, &dont_care, false);
+        next_shape = get_next_shape_internal(next_shape, ruby_internal_object_id, SHAPE_OBJ_ID, &dont_care, false);
     }
 
     return next_shape;
@@ -775,7 +776,7 @@ rb_shape_object_id_shape(VALUE obj)
     }
 
     bool dont_care;
-    rb_shape_t* next_shape = get_next_shape_internal(shape, internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
+    rb_shape_t* next_shape = get_next_shape_internal(shape, ruby_internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
     RUBY_ASSERT(next_shape);
     return next_shape;
 }
@@ -1363,7 +1364,7 @@ Init_default_shapes(void)
 
     id_frozen = rb_make_internal_id();
     id_t_object = rb_make_internal_id();
-    internal_object_id = rb_make_internal_id();
+    ruby_internal_object_id = rb_make_internal_id();
 
 #ifdef HAVE_MMAP
     size_t shape_cache_mmap_size = rb_size_mul_or_raise(REDBLACK_CACHE_SIZE, sizeof(redblack_node_t), rb_eRuntimeError);
@@ -1424,9 +1425,9 @@ Init_default_shapes(void)
     // ran out of shapes.
     rb_shape_t *shape;
     shape = get_next_shape_internal(too_complex_shape, id_frozen, SHAPE_FROZEN, &dont_care, true);
-    get_next_shape_internal(shape, internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
+    get_next_shape_internal(shape, ruby_internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
 
-    shape = get_next_shape_internal(too_complex_shape, internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
+    shape = get_next_shape_internal(too_complex_shape, ruby_internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
     get_next_shape_internal(shape, id_frozen, SHAPE_FROZEN, &dont_care, true);
 }
 

shape.h

@@ -39,7 +39,7 @@ typedef uint32_t redblack_id_t;
 //      ROOT_TOO_COMPLEX_SHAPE_ID   0x2
 #define FIRST_T_OBJECT_SHAPE_ID     0x3
 
-static ID internal_object_id;
+extern ID ruby_internal_object_id;
 
 typedef struct redblack_node redblack_node_t;
 

variable.c

@@ -2287,7 +2287,7 @@ rb_copy_generic_ivar(VALUE dest, VALUE obj)
             // obj is TOO_COMPLEX so we can copy its iv_hash
             st_table *table = st_copy(obj_fields_tbl->as.complex.table);
             if (rb_shape_has_object_id(src_shape)) {
-                st_data_t id = (st_data_t)internal_object_id;
+                st_data_t id = (st_data_t)ruby_internal_object_id;
                 st_delete(table, &id, NULL);
             }
             rb_obj_init_too_complex(dest, table);