archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Make stack bounds detection work with ASAN"

Browse source 
This reverts commit 6185cfdf38.
This commit is contained in:
KJ Tsanaktsidis 2024-01-12 17:32:16 +11:00
parent ac0ba3c07e
commit 6af0f442c7
3 changed files with 6 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
thread_pthread.c
View file

@ -12,7 +12,6 @@
#ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION
#include "internal/gc.h"
#include "internal/sanitizers.h"
#include "rjit.h"
#ifdef HAVE_SYS_RESOURCE_H
@ -1968,7 +1967,6 @@ void
ruby_init_stack(volatile void *addr)
{
native_main_thread.id = pthread_self();
addr = asan_get_real_stack_addr((void *)addr);
#if MAINSTACKADDR_AVAILABLE
if (native_main_thread.stack_maxsize) return;
@ -2067,7 +2065,7 @@ native_thread_init_stack(rb_thread_t *th, void *local_in_parent_frame)
if (get_stack(&start, &size) == 0) {
uintptr_t diff = (uintptr_t)start - (uintptr_t)local_in_parent_frame;
th->ec->machine.stack_start = asan_get_real_stack_addr(local_in_parent_frame);
th->ec->machine.stack_start = (uintptr_t)local_in_parent_frame;
th->ec->machine.stack_maxsize = size - diff;
}
}
@ -2194,10 +2192,12 @@ call_thread_start_func_2(rb_thread_t *th)
on a new thread, and replacing that data on fiber-switch would break it (see
bug #13887) */
VALUE stack_start = 0;
VALUE *stack_start_addr = asan_get_real_stack_addr(&stack_start);
VALUE *stack_start_addr = &stack_start;
native_thread_init_stack(th, stack_start_addr);
thread_start_func_2(th, th->ec->machine.stack_start);
/* Ensure that stack_start really was spilled to the stack */
RB_GC_GUARD(stack_start)
}
static void *