[llvm-branch-commits] [compiler-rt] 5205b03 - Fix GetThreadStackAndTls on Darwin and Windows

[Vitaly Buka via llvm-branch-commits]

Author: Vitaly Buka
Date: 2024-09-16T13:58:48-07:00
New Revision: 5205b030e9735b08a47f6d272a14375c02411d9e

URL: https://github.com/llvm/llvm-project/commit/5205b030e9735b08a47f6d272a14375c02411d9e
DIFF: https://github.com/llvm/llvm-project/commit/5205b030e9735b08a47f6d272a14375c02411d9e.diff

LOG: Fix GetThreadStackAndTls on Darwin and Windows

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
    compiler-rt/lib/sanitizer_common/sanitizer_win.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
index b4a5d687dbdf4c..2a36104e6f9f29 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
@@ -575,7 +575,7 @@ uptr TlsSize() {
 void GetThreadStackAndTls(bool main, uptr *stk_begin, uptr *stk_end,
                           uptr *tls_begin, uptr *tls_end) {
 #  if !SANITIZER_GO
-  GetThreadStackTopAndBottom(main, stk_begin, stk_end);
+  GetThreadStackTopAndBottom(main, stk_end, stk_begin);
   *tls_begin = TlsBaseAddr();
   *tls_end = *tls_begin + TlsSize();
 #  else

diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
index d8f51bf020e242..2c8f8343519ed8 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
@@ -884,7 +884,7 @@ void GetThreadStackAndTls(bool main, uptr *stk_begin, uptr *stk_end,
   *tls_begin = 0;
   *tls_end = 0;
 #  else
-  GetThreadStackTopAndBottom(main, stk_begin, stk_end);
+  GetThreadStackTopAndBottom(main, stk_end, stk_begin);
   *tls_begin = 0;
   *tls_end = 0;
 #  endif