[sanitizer] Fix pthread_exit interceptor's return type #71253
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`pthread_exit`'s return type is void.
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Heejin Ahn (aheejin) Changes
Full diff: https://github.com/llvm/llvm-project/pull/71253.diff 3 Files Affected:
diff --git a/compiler-rt/lib/asan/asan_interceptors.cpp b/compiler-rt/lib/asan/asan_interceptors.cpp
index 876682c3b6b3a35..0ee8e0ea786edeb 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 0889831373a8039..d7405b06752f421 100644
--- a/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
+++ b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
@@ -322,9 +322,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 fac6133ddf21b26..885f7ad5ddba961 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
|
aheejin
added a commit
to aheejin/emscripten
that referenced
this pull request
Nov 3, 2023
These interceptors was added in LLVM 17, but it looks they have a wrong return type. I submitted llvm/llvm-project#71253 to fix that upstream, but in the meantime we should fix this to pass our tests.
aheejin
added a commit
to aheejin/emscripten
that referenced
this pull request
Nov 14, 2023
These interceptors was added in LLVM 17, but it looks they have a wrong return type. I submitted llvm/llvm-project#71253 to fix that upstream, but in the meantime we should fix this to pass our tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pthread_exit's return type is void.