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

[Aiden Grossman via llvm-commits]

https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/170897

>From 730d3d7ffd804eab8dfe3cff2044c9c9f7faf17d Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Fri, 5 Dec 2025 18:21:50 +0000
Subject: [PATCH 1/3] [ASan] Do not return from void functions in
 asan_abi_shim.cpp

This was causing compilation failures on MacOS.
---
 compiler-rt/lib/asan_abi/asan_abi_shim.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
index 7ae7e77aea4a2..2cadf96dca2cd 100644
--- a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
+++ b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
@@ -366,10 +366,10 @@ void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
   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();
+  __asan_abi_suppress_fake_stack();
 }
 void __asan_unsuppress_fake_stack(void) {
-  return __asan_abi_unsuppress_fake_stack();
+  __asan_abi_unsuppress_fake_stack();
 }
 
 // Functions concerning poisoning and unpoisoning fake stack alloca

>From 2606e5eed103912b83610e6601e0cb5628c3f4de Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Fri, 5 Dec 2025 18:25:54 +0000
Subject: [PATCH 2/3] formatting

---
 compiler-rt/lib/asan_abi/asan_abi_shim.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/lib/asan_abi/asan_abi_shim.cpp b/compiler-rt/lib/asan_abi/asan_abi_shim.cpp
index 2cadf96dca2cd..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) {
-  __asan_abi_suppress_fake_stack();
-}
-void __asan_unsuppress_fake_stack(void) {
-  __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) {

>From 280eaadbcad0ef5a6319d3e445789881301dbfea Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Fri, 5 Dec 2025 18:35:26 +0000
Subject: [PATCH 3/3] fix test

---
 compiler-rt/lib/asan_abi/asan_abi.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);