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

Also prefer FL_TEST_RAW in gc.c

Browse Source 
Similar to 4a040eeb0d880b67a5005cce382122fd5b629b99, I noticed the test
for FL_FINALIZE checking FL_ABLE in a profile, and we shouldn't need to
do that here.
This commit is contained in:
John Hawthorn 2025-04-11 16:02:23 -07:00
parent 23000c7339
commit 36c64b3be8
Notes: git 2025-05-02 21:28:39 +00:00 
Merged: https://github.com/ruby/ruby/pull/13233
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gc.c
View File

@ -1216,14 +1216,14 @@ rb_data_free(void *objspace, VALUE obj)
void void
rb_gc_obj_free_vm_weak_references(VALUE obj) rb_gc_obj_free_vm_weak_references(VALUE obj)
{ {
if (FL_TEST(obj, FL_EXIVAR)) { if (FL_TEST_RAW(obj, FL_EXIVAR)) {
rb_free_generic_ivar((VALUE)obj); rb_free_generic_ivar((VALUE)obj);
FL_UNSET(obj, FL_EXIVAR); FL_UNSET(obj, FL_EXIVAR);
} }
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_STRING: case T_STRING:
if (FL_TEST(obj, RSTRING_FSTR)) { if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
rb_gc_free_fstring(obj); rb_gc_free_fstring(obj);
} }
break; break;
@ -1458,7 +1458,7 @@ rb_gc_obj_free(void *objspace, VALUE obj)
BUILTIN_TYPE(obj), (void*)obj, RBASIC(obj)->flags); BUILTIN_TYPE(obj), (void*)obj, RBASIC(obj)->flags);
} }
if (FL_TEST(obj, FL_FINALIZE)) { if (FL_TEST_RAW(obj, FL_FINALIZE)) {
rb_gc_impl_make_zombie(objspace, obj, 0, 0); rb_gc_impl_make_zombie(objspace, obj, 0, 0);
return FALSE; return FALSE;
} }
@ -2665,7 +2665,7 @@ rb_gc_mark_roots(void *objspace, const char **categoryp)
void void
rb_gc_mark_children(void *objspace, VALUE obj) rb_gc_mark_children(void *objspace, VALUE obj)
{ {
if (FL_TEST(obj, FL_EXIVAR)) { if (FL_TEST_RAW(obj, FL_EXIVAR)) {
rb_mark_generic_ivar(obj); rb_mark_generic_ivar(obj);
} }
@ -2700,7 +2700,7 @@ rb_gc_mark_children(void *objspace, VALUE obj)
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_CLASS: case T_CLASS:
if (FL_TEST(obj, FL_SINGLETON)) { if (FL_TEST_RAW(obj, FL_SINGLETON)) {
gc_mark_internal(RCLASS_ATTACHED_OBJECT(obj)); gc_mark_internal(RCLASS_ATTACHED_OBJECT(obj));
} }
// Continue to the shared T_CLASS/T_MODULE // Continue to the shared T_CLASS/T_MODULE
@ -3635,7 +3635,7 @@ rb_gc_update_object_references(void *objspace, VALUE obj)
{ {
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_CLASS: case T_CLASS:
if (FL_TEST(obj, FL_SINGLETON)) { if (FL_TEST_RAW(obj, FL_SINGLETON)) {
UPDATE_IF_MOVED(objspace, RCLASS_ATTACHED_OBJECT(obj)); UPDATE_IF_MOVED(objspace, RCLASS_ATTACHED_OBJECT(obj));
} }
// Continue to the shared T_CLASS/T_MODULE // Continue to the shared T_CLASS/T_MODULE