Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make the stack handling more robust to sanitizers and -O3 #6143

Merged
merged 2 commits into from
Nov 22, 2024
Merged

fix: make the stack handling more robust to sanitizers and -O3 #6143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f7f170
Make the stack handling more robust
eric-wieser Nov 20, 2024
8898df3
Update stackinfo.cpp
eric-wieser Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions src/runtime/stackinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,23 @@ size_t get_stack_size(bool main) {
}
#endif

#ifndef __has_builtin
#define __has_builtin(x) 0 /* for non-clang compilers */
#endif

// taken from https://github.com/llvm/llvm-project/blob/llvmorg-10.0.0-rc1/clang/lib/Basic/Stack.cpp#L24
static void *get_stack_pointer() {
#if __GNUC__ || __has_builtin(__builtin_frame_address)
return __builtin_frame_address(0);
#elif defined(_MSC_VER)
return _AddressOfReturnAddress();
#else
char x = 0;
char *volatile ptr = &x;
return ptr;
#endif
}

LEAN_THREAD_VALUE(bool, g_stack_info_init, false);
LEAN_THREAD_VALUE(size_t, g_stack_size, 0);
LEAN_THREAD_VALUE(size_t, g_stack_base, 0);
Expand All @@ -81,8 +98,7 @@ LEAN_THREAD_VALUE(size_t, g_stack_threshold, 0);
void save_stack_info(bool main) {
g_stack_info_init = true;
g_stack_size = get_stack_size(main);
char x;
g_stack_base = reinterpret_cast<size_t>(&x);
g_stack_base = reinterpret_cast<size_t>(get_stack_pointer());
/* g_stack_threshold is a redundant value used to optimize check_stack */
g_stack_threshold = g_stack_base + LEAN_STACK_BUFFER_SPACE - g_stack_size;
if (g_stack_threshold > g_stack_base + LEAN_STACK_BUFFER_SPACE) {
Expand All @@ -92,8 +108,7 @@ void save_stack_info(bool main) {
}

size_t get_used_stack_size() {
char y;
size_t curr_stack = reinterpret_cast<size_t>(&y);
size_t curr_stack = reinterpret_cast<size_t>(get_stack_pointer());
return g_stack_base - curr_stack;
}

Expand All @@ -113,8 +128,7 @@ void throw_stack_space_exception(char const * component_name) {
void check_stack(char const * component_name) {
if (!g_stack_info_init)
save_stack_info(false);
char y;
size_t curr_stack = reinterpret_cast<size_t>(&y);
size_t curr_stack = reinterpret_cast<size_t>(get_stack_pointer());
if (curr_stack < g_stack_threshold)
throw_stack_space_exception(component_name);
}
Expand Down
Loading