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

Fix ASAN builds

Browse Source
This commit is contained in:
Peter Zhu 2024-07-03 14:40:05 -04:00
parent 4c9134d2b2
commit f88841b8f3
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gc.c
View File

@ -2311,7 +2311,6 @@ static void
each_stack_location(void *objspace, const rb_execution_context_t *ec, each_stack_location(void *objspace, const rb_execution_context_t *ec,
const VALUE *stack_start, const VALUE *stack_end, void (*cb)(void *objspace, VALUE obj)) const VALUE *stack_start, const VALUE *stack_end, void (*cb)(void *objspace, VALUE obj))
{ {
gc_mark_locations(objspace, stack_start, stack_end, cb); gc_mark_locations(objspace, stack_start, stack_end, cb);
#if defined(__mc68000__) #if defined(__mc68000__)
@ -2321,13 +2320,22 @@ each_stack_location(void *objspace, const rb_execution_context_t *ec,
#endif #endif
} }
struct mark_machine_stack_location_maybe_data {
void *objspace;
#ifdef RUBY_ASAN_ENABLED
const rb_execution_context_t *ec;
#endif
};
static void static void
gc_mark_machine_stack_location_maybe(void *objspace, VALUE obj) gc_mark_machine_stack_location_maybe(void *data, VALUE obj)
{ {
void *objspace = ((struct mark_machine_stack_location_maybe_data *)data)->objspace;
rb_gc_impl_mark_maybe(objspace, obj); rb_gc_impl_mark_maybe(objspace, obj);
#ifdef RUBY_ASAN_ENABLED #ifdef RUBY_ASAN_ENABLED
const rb_execution_context_t *ec = objspace->marking_machine_context_ec; const rb_execution_context_t *ec = ((struct mark_machine_stack_location_maybe_data *)data)->ec;
void *fake_frame_start; void *fake_frame_start;
void *fake_frame_end; void *fake_frame_end;
bool is_fake_frame = asan_get_fake_stack_extents( bool is_fake_frame = asan_get_fake_stack_extents(
@ -2402,38 +2410,36 @@ mark_current_machine_context(void *objspace, rb_execution_context_t *ec)
SET_STACK_END; SET_STACK_END;
GET_STACK_BOUNDS(stack_start, stack_end, 1); GET_STACK_BOUNDS(stack_start, stack_end, 1);
struct mark_machine_stack_location_maybe_data data = {
.objspace = objspace,
#ifdef RUBY_ASAN_ENABLED #ifdef RUBY_ASAN_ENABLED
objspace->marking_machine_context_ec = ec; .ec = ec
#endif #endif
};
each_location(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v), gc_mark_machine_stack_location_maybe); each_location((void *)&data, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v), gc_mark_machine_stack_location_maybe);
each_stack_location(objspace, 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);
#ifdef RUBY_ASAN_ENABLED
objspace->marking_machine_context_ec = NULL;
#endif
} }
#endif #endif
void void
rb_gc_mark_machine_context(const rb_execution_context_t *ec) rb_gc_mark_machine_context(const rb_execution_context_t *ec)
{ {
#ifdef RUBY_ASAN_ENABLED
objspace->marking_machine_context_ec = ec;
#endif
VALUE *stack_start, *stack_end; VALUE *stack_start, *stack_end;
GET_STACK_BOUNDS(stack_start, stack_end, 0); GET_STACK_BOUNDS(stack_start, stack_end, 0);
RUBY_DEBUG_LOG("ec->th:%u stack_start:%p stack_end:%p", rb_ec_thread_ptr(ec)->serial, stack_start, stack_end); RUBY_DEBUG_LOG("ec->th:%u stack_start:%p stack_end:%p", rb_ec_thread_ptr(ec)->serial, stack_start, stack_end);
each_stack_location(rb_gc_get_objspace(), ec, stack_start, stack_end, gc_mark_machine_stack_location_maybe); struct mark_machine_stack_location_maybe_data data = {
int num_regs = sizeof(ec->machine.regs)/(sizeof(VALUE)); .objspace = rb_gc_get_objspace(),
each_location(rb_gc_get_objspace(), (VALUE*)&ec->machine.regs, num_regs, gc_mark_machine_stack_location_maybe);
#ifdef RUBY_ASAN_ENABLED #ifdef RUBY_ASAN_ENABLED
objspace->marking_machine_context_ec = NULL; .ec = ec
#endif #endif
};
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));
each_location((void *)&data, (VALUE*)&ec->machine.regs, num_regs, gc_mark_machine_stack_location_maybe);
} }
static int static int

5
gc_impl.c
View File

@ -654,11 +654,6 @@ typedef struct rb_objspace {
rb_postponed_job_handle_t finalize_deferred_pjob; rb_postponed_job_handle_t finalize_deferred_pjob;
unsigned long live_ractor_cache_count; unsigned long live_ractor_cache_count;
#ifdef RUBY_ASAN_ENABLED
rb_execution_context_t *marking_machine_context_ec;
#endif
} rb_objspace_t; } rb_objspace_t;
#ifndef HEAP_PAGE_ALIGN_LOG #ifndef HEAP_PAGE_ALIGN_LOG