[compiler-rt] 35203a6 - [ASan] Do not return from void functions in asan_abi_shim.cpp (#170897)

[via llvm-commits]

Author: Aiden Grossman
Date: 2025-12-05T10:48:37-08:00
New Revision: 35203a6a86c79b75b94a5f48b38ab75e90b3f40a

URL: https://github.com/llvm/llvm-project/commit/35203a6a86c79b75b94a5f48b38ab75e90b3f40a
DIFF: https://github.com/llvm/llvm-project/commit/35203a6a86c79b75b94a5f48b38ab75e90b3f40a.diff

LOG: [ASan] Do not return from void functions in asan_abi_shim.cpp (#170897)

This was causing compilation failures on MacOS.

Added: 
    

Modified: 
    compiler-rt/lib/asan_abi/asan_abi.h
    compiler-rt/lib/asan_abi/asan_abi_shim.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/asan_abi/asan_abi.h b/compiler-rt/lib/asan_abi/asan_abi.h
index cb59976c8506c..558428fb72699 100644
--- a/compiler-rt/lib/asan_abi/asan_abi.h
+++ b/compiler-rt/lib/asan_abi/asan_abi.h
@@ -76,8 +76,8 @@ void *__asan_abi_load_cxx_array_cookie(void **p);
 void *__asan_abi_get_current_fake_stack();
 void *__asan_abi_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
                                        void **end);
-void *__asan_abi_suppress_fake_stack();
-void *__asan_abi_unsuppress_fake_stack();
+void __asan_abi_suppress_fake_stack();
+void __asan_abi_unsuppress_fake_stack();
 
 // Functions concerning poisoning and unpoisoning fake stack alloca
 void __asan_abi_alloca_poison(void *addr, size_t size);

diff  --git a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
index 7ae7e77aea4a2..1d2a2fe768ab0 100644
--- a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
+++ b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
@@ -365,12 +365,8 @@ void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
                                    void **end) {
   return __asan_abi_addr_is_in_fake_stack(fake_stack, addr, beg, end);
 }
-void __asan_suppress_fake_stack(void) {
-  return __asan_abi_suppress_fake_stack();
-}
-void __asan_unsuppress_fake_stack(void) {
-  return __asan_abi_unsuppress_fake_stack();
-}
+void __asan_suppress_fake_stack(void) { __asan_abi_suppress_fake_stack(); }
+void __asan_unsuppress_fake_stack(void) { __asan_abi_unsuppress_fake_stack(); }
 
 // Functions concerning poisoning and unpoisoning fake stack alloca
 void __asan_alloca_poison(uptr addr, uptr size) {