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

Change each_location to accept data instead of objspace

Browse Source 
The callers were abusing each_location and passing data into the objspace
argument.
This commit is contained in:
Peter Zhu 2024-08-28 15:04:09 -04:00
parent 591a157b0f
commit c162da69e7
Notes: git 2024-08-29 18:37:20 +00:00 
Merged: https://github.com/ruby/ruby/pull/11481
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

@ -2098,14 +2098,14 @@ rb_gc_remove_weak(VALUE parent_obj, VALUE *ptr)
rb_gc_impl_remove_weak(rb_gc_get_objspace(), parent_obj, ptr); rb_gc_impl_remove_weak(rb_gc_get_objspace(), parent_obj, ptr);
} }
ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void each_location(void *objspace, register const VALUE *x, register long n, void (*cb)(void *objspace, VALUE))); ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void each_location(register const VALUE *x, register long n, void (*cb)(void *data, VALUE), void *data));
static void static void
each_location(void *objspace, register const VALUE *x, register long n, void (*cb)(void *objspace, VALUE)) each_location(register const VALUE *x, register long n, void (*cb)(void *data, VALUE obj), void *data)
{ {
VALUE v; VALUE v;
while (n--) { while (n--) {
v = *x; v = *x;
cb(objspace, v); cb(data, v);
x++; x++;
} }
} }
@ -2117,7 +2117,7 @@ gc_mark_locations(void *objspace, const VALUE *start, const VALUE *end, void (*c
if (end <= start) return; if (end <= start) return;
n = end - start; n = end - start;
each_location(objspace, start, n, cb); each_location(start, n, cb, objspace);
} }
void void
@ -2350,7 +2350,7 @@ mark_current_machine_context(void *objspace, rb_execution_context_t *ec)
#endif #endif
}; };
each_location((void *)&data, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v), gc_mark_machine_stack_location_maybe); each_location(save_regs_gc_mark.v, numberof(save_regs_gc_mark.v), gc_mark_machine_stack_location_maybe, &data);
each_stack_location((void *)&data, ec, stack_start, stack_end, gc_mark_machine_stack_location_maybe); each_stack_location((void *)&data, ec, stack_start, stack_end, gc_mark_machine_stack_location_maybe);
} }
#endif #endif
@ -2372,7 +2372,7 @@ rb_gc_mark_machine_context(const rb_execution_context_t *ec)
each_stack_location((void *)&data, ec, stack_start, stack_end, gc_mark_machine_stack_location_maybe); each_stack_location((void *)&data, ec, stack_start, stack_end, gc_mark_machine_stack_location_maybe);
int num_regs = sizeof(ec->machine.regs)/(sizeof(VALUE)); int num_regs = sizeof(ec->machine.regs)/(sizeof(VALUE));
each_location((void *)&data, (VALUE*)&ec->machine.regs, num_regs, gc_mark_machine_stack_location_maybe); each_location((VALUE*)&ec->machine.regs, num_regs, gc_mark_machine_stack_location_maybe, &data);
} }
static int static int