Skip to content

Commit a463f5a

Browse files
committed
Reflect GetThreadStackAndTls's API change
In llvm/llvm-project#108883, `GetThreadStackAndTls`'s API changed from ``` void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size, uptr *tls_addr, uptr *tls_size); ``` to ``` void GetThreadStackAndTls(bool main, uptr *stk_begin, uptr *stk_end, uptr *tls_begin, uptr *tls_end); ``` So this fixes `sanitizer_emscripten.cpp`'s `GetThreadStackAndTls` accordingly. Also this changes the variable names to match those of the header (https://github.com/llvm/llvm-project/blob/ec28b8f9cc7f2ac187d8a617a6d08d5e56f9120e/compiler-rt/lib/sanitizer_common/sanitizer_common.h#L86-L87)
1 parent c534e99 commit a463f5a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_emscripten.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,15 @@ uptr GetTlsSize() {
9898

9999
void InitTlsSize() {}
100100

101-
void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size,
102-
uptr *tls_addr, uptr *tls_size) {
103-
uptr stk_top;
104-
GetThreadStackTopAndBottom(true, &stk_top, stk_addr);
105-
*stk_size = stk_top - *stk_addr;
101+
void GetThreadStackAndTls(bool main, uptr *stk_begin, uptr *stk_end,
102+
uptr *tls_begin, uptr *tls_end) {
103+
GetThreadStackTopAndBottom(true, stk_end, stk_begin);
106104
#ifdef __EMSCRIPTEN_PTHREADS__
107-
*tls_addr = (uptr) __builtin_wasm_tls_base();
108-
*tls_size = __builtin_wasm_tls_size();
105+
*tls_begin = (uptr) __builtin_wasm_tls_base();
106+
uptr tls_size = __builtin_wasm_tls_size();
107+
*tls_end = *tls_begin + tls_size;
109108
#else
110-
*tls_addr = *tls_size = 0;
109+
*tls_begin = *tls_end = 0;
111110
#endif
112111
}
113112

0 commit comments

Comments
 (0)