1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move RUBY_INTERNAL_EVENT_FREEOBJ into GC implementation

Browse Source 
Instead of calling rb_gc_event_hook inside of rb_gc_obj_free, it should
be up to the GC implementation to call the event.
This commit is contained in:
Peter Zhu 2024-09-30 13:37:28 -04:00
parent 292c9793ab
commit 30507a4aed
Notes: git 2024-09-30 18:23:51 +00:00 
Merged: https://github.com/ruby/ruby/pull/11742
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gc.c
View File

@ -1087,8 +1087,6 @@ rb_gc_obj_free(void *objspace, VALUE obj)
{ {
RB_DEBUG_COUNTER_INC(obj_free); RB_DEBUG_COUNTER_INC(obj_free);
rb_gc_event_hook(obj, RUBY_INTERNAL_EVENT_FREEOBJ);
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_NIL: case T_NIL:
case T_FIXNUM: case T_FIXNUM:

2
gc/default.c
View File

@ -3565,6 +3565,8 @@ gc_sweep_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bit
#undef CHECK #undef CHECK
#endif #endif
rb_gc_event_hook(vp, RUBY_INTERNAL_EVENT_FREEOBJ);
bool has_object_id = FL_TEST(vp, FL_SEEN_OBJ_ID); bool has_object_id = FL_TEST(vp, FL_SEEN_OBJ_ID);
if (rb_gc_obj_free(objspace, vp)) { if (rb_gc_obj_free(objspace, vp)) {
if (has_object_id) { if (has_object_id) {