Skip to content

Commit 35203a6

Browse files
[ASan] Do not return from void functions in asan_abi_shim.cpp (#170897)
This was causing compilation failures on MacOS.
1 parent 11056c3 commit 35203a6

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

compiler-rt/lib/asan_abi/asan_abi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ void *__asan_abi_load_cxx_array_cookie(void **p);
7676
void *__asan_abi_get_current_fake_stack();
7777
void *__asan_abi_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
7878
void **end);
79-
void *__asan_abi_suppress_fake_stack();
80-
void *__asan_abi_unsuppress_fake_stack();
79+
void __asan_abi_suppress_fake_stack();
80+
void __asan_abi_unsuppress_fake_stack();
8181

8282
// Functions concerning poisoning and unpoisoning fake stack alloca
8383
void __asan_abi_alloca_poison(void *addr, size_t size);

compiler-rt/lib/asan_abi/asan_abi_shim.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,8 @@ void *__asan_addr_is_in_fake_stack(void *fake_stack, void *addr, void **beg,
365365
void **end) {
366366
return __asan_abi_addr_is_in_fake_stack(fake_stack, addr, beg, end);
367367
}
368-
void __asan_suppress_fake_stack(void) {
369-
return __asan_abi_suppress_fake_stack();
370-
}
371-
void __asan_unsuppress_fake_stack(void) {
372-
return __asan_abi_unsuppress_fake_stack();
373-
}
368+
void __asan_suppress_fake_stack(void) { __asan_abi_suppress_fake_stack(); }
369+
void __asan_unsuppress_fake_stack(void) { __asan_abi_unsuppress_fake_stack(); }
374370

375371
// Functions concerning poisoning and unpoisoning fake stack alloca
376372
void __asan_alloca_poison(uptr addr, uptr size) {

0 commit comments

Comments
 (0)