mmtk: fix linking issue with shape.h

Author: byroot

gc.c

@@ -2093,6 +2093,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)
 {

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);

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;