From d85940303730ee3127cfcf95cd549d4e5c4e0de1 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Sun, 5 Nov 2023 22:41:37 -0800 Subject: [PATCH] [sanitizer] Fix pthread_exit interceptor's return type (#71253) `pthread_exit`'s return type is void. --- compiler-rt/lib/asan/asan_interceptors.cpp | 4 ++-- compiler-rt/lib/hwasan/hwasan_interceptors.cpp | 4 ++-- compiler-rt/lib/lsan/lsan_interceptors.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler-rt/lib/asan/asan_interceptors.cpp b/compiler-rt/lib/asan/asan_interceptors.cpp index 876682c3b6b3..0ee8e0ea786e 100644 --- a/compiler-rt/lib/asan/asan_interceptors.cpp +++ b/compiler-rt/lib/asan/asan_interceptors.cpp @@ -300,9 +300,9 @@ INTERCEPTOR(int, pthread_detach, void *thread) { return result; } -INTERCEPTOR(int, pthread_exit, void *retval) { +INTERCEPTOR(void, pthread_exit, void *retval) { asanThreadArgRetval().Finish(GetThreadSelf(), retval); - return REAL(pthread_exit)(retval); + REAL(pthread_exit)(retval); } # if ASAN_INTERCEPT_TRYJOIN diff --git a/compiler-rt/lib/hwasan/hwasan_interceptors.cpp b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp index 1a77d776e65e..e657ce41ee4d 100644 --- a/compiler-rt/lib/hwasan/hwasan_interceptors.cpp +++ b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp @@ -305,9 +305,9 @@ INTERCEPTOR(int, pthread_detach, void *thread) { return result; } -INTERCEPTOR(int, pthread_exit, void *retval) { +INTERCEPTOR(void, pthread_exit, void *retval) { hwasanThreadArgRetval().Finish(GetThreadSelf(), retval); - return REAL(pthread_exit)(retval); + REAL(pthread_exit)(retval); } # if SANITIZER_GLIBC diff --git a/compiler-rt/lib/lsan/lsan_interceptors.cpp b/compiler-rt/lib/lsan/lsan_interceptors.cpp index fac6133ddf21..885f7ad5ddba 100644 --- a/compiler-rt/lib/lsan/lsan_interceptors.cpp +++ b/compiler-rt/lib/lsan/lsan_interceptors.cpp @@ -490,9 +490,9 @@ INTERCEPTOR(int, pthread_detach, void *thread) { return result; } -INTERCEPTOR(int, pthread_exit, void *retval) { +INTERCEPTOR(void, pthread_exit, void *retval) { GetThreadArgRetval().Finish(GetThreadSelf(), retval); - return REAL(pthread_exit)(retval); + REAL(pthread_exit)(retval); } # if SANITIZER_INTERCEPT_TRYJOIN