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

Don't directly use rb_gc_impl_location in gc.c

Browse Source 
Use the wrapper gc_location_internal instead that checks for special
constants.
This commit is contained in:
Peter Zhu 2024-12-16 11:07:33 -05:00
parent d28368d27f
commit 80b8feb929
Notes: git 2024-12-16 18:32:54 +00:00 
Merged: https://github.com/ruby/ruby/pull/12359
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gc.c
View File

@ -399,7 +399,7 @@ void rb_vm_update_references(void *ptr);
#define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \ #define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \
if (rb_gc_impl_object_moved_p((_objspace), (VALUE)(_thing))) { \ if (rb_gc_impl_object_moved_p((_objspace), (VALUE)(_thing))) { \
*(_type *)&(_thing) = (_type)rb_gc_impl_location(_objspace, (VALUE)_thing); \ *(_type *)&(_thing) = (_type)gc_location_internal(_objspace, (VALUE)_thing); \
} \ } \
} while (0) } while (0)
@ -2420,6 +2420,22 @@ gc_mark_machine_stack_location_maybe(VALUE obj, void *data)
#endif #endif
} }
static VALUE
gc_location_internal(void *objspace, VALUE value)
{
if (SPECIAL_CONST_P(value)) {
return value;
}
return rb_gc_impl_location(objspace, value);
}
VALUE
rb_gc_location(VALUE value)
{
return gc_location_internal(rb_gc_get_objspace(), value);
}
#if defined(__wasm__) #if defined(__wasm__)
@ -3147,16 +3163,6 @@ check_id_table_move(VALUE value, void *data)
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
} }
VALUE
rb_gc_location(VALUE value)
{
if (SPECIAL_CONST_P(value)) {
return value;
}
return rb_gc_impl_location(rb_gc_get_objspace(), value);
}
void void
rb_gc_prepare_heap_process_object(VALUE obj) rb_gc_prepare_heap_process_object(VALUE obj)
{ {
@ -3195,7 +3201,7 @@ update_id_table(VALUE *value, void *data, int existing)
void *objspace = (void *)data; void *objspace = (void *)data;
if (rb_gc_impl_object_moved_p(objspace, (VALUE)*value)) { if (rb_gc_impl_object_moved_p(objspace, (VALUE)*value)) {
*value = rb_gc_impl_location(objspace, (VALUE)*value); *value = gc_location_internal(objspace, (VALUE)*value);
} }
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
@ -3216,12 +3222,12 @@ update_cc_tbl_i(VALUE ccs_ptr, void *objspace)
VM_ASSERT(vm_ccs_p(ccs)); VM_ASSERT(vm_ccs_p(ccs));
if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->cme)) { if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->cme)) {
ccs->cme = (const rb_callable_method_entry_t *)rb_gc_impl_location(objspace, (VALUE)ccs->cme); ccs->cme = (const rb_callable_method_entry_t *)gc_location_internal(objspace, (VALUE)ccs->cme);
} }
for (int i=0; i<ccs->len; i++) { for (int i=0; i<ccs->len; i++) {
if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) { if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) {
ccs->entries[i].cc = (struct rb_callcache *)rb_gc_location((VALUE)ccs->entries[i].cc); ccs->entries[i].cc = (struct rb_callcache *)gc_location_internal(objspace, (VALUE)ccs->entries[i].cc);
} }
} }
@ -3249,7 +3255,7 @@ update_cvc_tbl_i(VALUE cvc_entry, void *objspace)
TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, entry->cref); TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, entry->cref);
} }
entry->class_value = rb_gc_impl_location(objspace, entry->class_value); entry->class_value = gc_location_internal(objspace, entry->class_value);
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
} }
@ -3269,11 +3275,11 @@ update_const_table(VALUE value, void *objspace)
rb_const_entry_t *ce = (rb_const_entry_t *)value; rb_const_entry_t *ce = (rb_const_entry_t *)value;
if (rb_gc_impl_object_moved_p(objspace, ce->value)) { if (rb_gc_impl_object_moved_p(objspace, ce->value)) {
ce->value = rb_gc_impl_location(objspace, ce->value); ce->value = gc_location_internal(objspace, ce->value);
} }
if (rb_gc_impl_object_moved_p(objspace, ce->file)) { if (rb_gc_impl_object_moved_p(objspace, ce->file)) {
ce->file = rb_gc_impl_location(objspace, ce->file); ce->file = gc_location_internal(objspace, ce->file);
} }
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
@ -3461,8 +3467,8 @@ rb_gc_update_vm_references(void *objspace)
rb_vm_update_references(vm); rb_vm_update_references(vm);
rb_gc_update_global_tbl(); rb_gc_update_global_tbl();
global_symbols.ids = rb_gc_impl_location(objspace, global_symbols.ids); global_symbols.ids = gc_location_internal(objspace, global_symbols.ids);
global_symbols.dsymbol_fstr_hash = rb_gc_impl_location(objspace, global_symbols.dsymbol_fstr_hash); global_symbols.dsymbol_fstr_hash = gc_location_internal(objspace, global_symbols.dsymbol_fstr_hash);
gc_update_table_refs(global_symbols.str_sym); gc_update_table_refs(global_symbols.str_sym);
#if USE_YJIT #if USE_YJIT
@ -3570,8 +3576,7 @@ rb_gc_update_object_references(void *objspace, VALUE obj)
for (size_t offset = *offset_list; offset != RUBY_REF_END; offset = *offset_list++) { for (size_t offset = *offset_list; offset != RUBY_REF_END; offset = *offset_list++) {
VALUE *ref = (VALUE *)((char *)ptr + offset); VALUE *ref = (VALUE *)((char *)ptr + offset);
if (SPECIAL_CONST_P(*ref)) continue; *ref = gc_location_internal(objspace, *ref);
*ref = rb_gc_impl_location(objspace, *ref);
} }
} }
else if (RTYPEDDATA_P(obj)) { else if (RTYPEDDATA_P(obj)) {
@ -4153,7 +4158,7 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
break; break;
} }
case T_MOVED: { case T_MOVED: {
APPEND_F("-> %p", (void*)rb_gc_impl_location(rb_gc_get_objspace(), obj)); APPEND_F("-> %p", (void*)gc_location_internal(rb_gc_get_objspace(), obj));
break; break;
} }
case T_HASH: { case T_HASH: {