mmtk: fix linking issue with shape.h

byroot · byroot · commit 7f532123fd48 · 2025-05-05T12:26:25.000+02:00
diff --git a/gc.c b/gc.c
@@ -2092,6 +2092,12 @@ rb_obj_id(VALUE obj)
     return rb_find_object_id(rb_gc_get_objspace(), obj, object_id);
 }
 
+bool
+rb_obj_id_p(VALUE obj)
+{
+    return rb_shape_obj_has_id(obj);
+}
+
 static enum rb_id_table_iterator_result
 cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
 {
diff --git a/gc/default/default.c b/gc/default/default.c
@@ -29,7 +29,6 @@
 #include "darray.h"
 #include "gc/gc.h"
 #include "gc/gc_impl.h"
-#include "shape.h"
 
 #ifndef BUILDING_MODULAR_GC
 # include "probes.h"
@@ -6113,7 +6112,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
     if (RVALUE_MARKING(objspace, obj)) SET_ENTRY(marking, Qtrue);
     if (RVALUE_MARKED(objspace, obj)) SET_ENTRY(marked, Qtrue);
     if (RVALUE_PINNED(objspace, obj)) SET_ENTRY(pinned, Qtrue);
-    if (rb_shape_obj_has_id(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
     if (FL_TEST(obj, FL_SHAREABLE)) SET_ENTRY(shareable, Qtrue);
 
     object_metadata_entries[n].name = 0;
diff --git a/gc/gc.h b/gc/gc.h
@@ -72,6 +72,7 @@ size_t rb_obj_memsize_of(VALUE obj);
 void rb_gc_prepare_heap_process_object(VALUE obj);
 bool ruby_free_at_exit_p(void);
 bool rb_memerror_reentered(void);
+bool rb_obj_id_p(VALUE);
 
 #if USE_MODULAR_GC
 bool rb_gc_event_hook_required_p(rb_event_flag_t event);
diff --git a/gc/mmtk/mmtk.c b/gc/mmtk/mmtk.c
@@ -8,7 +8,6 @@
 #include "gc/gc.h"
 #include "gc/gc_impl.h"
 #include "gc/mmtk/mmtk.h"
-#include "shape.h"
 
 #include "ccan/list/list.h"
 #include "darray.h"
@@ -1215,7 +1214,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
     n++; \
 } while (0)
 
-    if (rb_shape_obj_has_id(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (rb_obj_id_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
 
     object_metadata_entries[n].name = 0;
     object_metadata_entries[n].val = 0;

Original file line number	Diff line number	Diff line change
`@@ -2092,6 +2092,12 @@ rb_obj_id(VALUE obj)`
`2092`	`2092`	`return rb_find_object_id(rb_gc_get_objspace(), obj, object_id);`
`2093`	`2093`	`}`
`2094`	`2094`
	`2095`	`+bool`
	`2096`	`+rb_obj_id_p(VALUE obj)`
	`2097`	`+{`
	`2098`	`+ return rb_shape_obj_has_id(obj);`
	`2099`	`+}`
	`2100`	`+`
`2095`	`2101`	`static enum rb_id_table_iterator_result`
`2096`	`2102`	`cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)`
`2097`	`2103`	`{`