[compiler-rt] 76b6707 - [NFC][asan] Guard implemetation with ASAN_INTERCEPT_SWAPCONTEXT

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 8 15:00:16 PST 2022


Author: Vitaly Buka
Date: 2022-12-08T15:00:06-08:00
New Revision: 76b6707e648e9d7b460230b360c96d09c365bc4b

URL: https://github.com/llvm/llvm-project/commit/76b6707e648e9d7b460230b360c96d09c365bc4b
DIFF: https://github.com/llvm/llvm-project/commit/76b6707e648e9d7b460230b360c96d09c365bc4b.diff

LOG: [NFC][asan] Guard implemetation with ASAN_INTERCEPT_SWAPCONTEXT

Added: 
    

Modified: 
    compiler-rt/lib/asan/asan_linux.cpp
    compiler-rt/lib/asan/asan_mac.cpp
    compiler-rt/lib/asan/asan_win.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/asan/asan_linux.cpp b/compiler-rt/lib/asan/asan_linux.cpp
index 89450fc120a04..4c01ff9e2ae83 100644
--- a/compiler-rt/lib/asan/asan_linux.cpp
+++ b/compiler-rt/lib/asan/asan_linux.cpp
@@ -208,7 +208,7 @@ void AsanCheckIncompatibleRT() {
 }
 #endif // SANITIZER_ANDROID
 
-#if !SANITIZER_ANDROID
+#  if ASAN_INTERCEPT_SWAPCONTEXT
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
   ucontext_t *ucp = (ucontext_t*)context;
   *stack = (uptr)ucp->uc_stack.ss_sp;
@@ -220,13 +220,7 @@ void ResetContextStack(void *context) {
   ucp->uc_stack.ss_sp = nullptr;
   ucp->uc_stack.ss_size = 0;
 }
-#  else
-void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
-  UNIMPLEMENTED();
-}
-
-void ResetContextStack(void *context) { UNIMPLEMENTED(); }
-#  endif
+#  endif  // ASAN_INTERCEPT_SWAPCONTEXT
 
 void *AsanDlSymNext(const char *sym) {
   return dlsym(RTLD_NEXT, sym);

diff  --git a/compiler-rt/lib/asan/asan_mac.cpp b/compiler-rt/lib/asan/asan_mac.cpp
index a2d5c31a3f774..c9bd5fb8e1a8f 100644
--- a/compiler-rt/lib/asan/asan_mac.cpp
+++ b/compiler-rt/lib/asan/asan_mac.cpp
@@ -95,12 +95,6 @@ void FlushUnneededASanShadowMemory(uptr p, uptr size) {
   ReleaseMemoryPagesToOS(MemToShadow(p), MemToShadow(p + size));
 }
 
-void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
-  UNIMPLEMENTED();
-}
-
-void ResetContextStack(void *context) { UNIMPLEMENTED(); }
-
 // Support for the following functions from libdispatch on Mac OS:
 //   dispatch_async_f()
 //   dispatch_async()

diff  --git a/compiler-rt/lib/asan/asan_win.cpp b/compiler-rt/lib/asan/asan_win.cpp
index f11df0613d1f4..7dbd7ab98a17b 100644
--- a/compiler-rt/lib/asan/asan_win.cpp
+++ b/compiler-rt/lib/asan/asan_win.cpp
@@ -263,12 +263,6 @@ void AsanCheckDynamicRTPrereqs() {}
 
 void AsanCheckIncompatibleRT() {}
 
-void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
-  UNIMPLEMENTED();
-}
-
-void ResetContextStack(void *context) { UNIMPLEMENTED(); }
-
 void AsanOnDeadlySignal(int, void *siginfo, void *context) { UNIMPLEMENTED(); }
 
 bool PlatformUnpoisonStacks() { return false; }


        


More information about the llvm-commits mailing list