Skip to content

[NFC] Fix typo in REAL(pthread_join(th, ret)) #102393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

vitalybuka
Copy link
Collaborator

Looks like the macro expands to the same,
but usually we do REAL(pthread_join)(th, ret).

Created using spr 1.3.4
@llvmbot
Copy link
Member

llvmbot commented Aug 7, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

Looks like the macro expands to the same,
but usually we do REAL(pthread_join)(th, ret).


Full diff: https://github.com/llvm/llvm-project/pull/102393.diff

2 Files Affected:

  • (modified) compiler-rt/lib/sanitizer_common/sanitizer_posix.h (+1-1)
  • (modified) compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp (+1-1)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_posix.h
index 14617e4771bec4..d0954f77e97136 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_posix.h
@@ -86,7 +86,7 @@ int internal_pthread_join(void *th, void **ret);
       return REAL(pthread_create)(th, attr, callback, param);             \
     }                                                                     \
     int internal_pthread_join(void *th, void **ret) {                     \
-      return REAL(pthread_join(th, ret));                                 \
+      return REAL(pthread_join)(th, ret);                                 \
     }                                                                     \
     }  // namespace __sanitizer
 
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp b/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp
index 9cab2a37271288..1be65bc99b260d 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp
@@ -1097,7 +1097,7 @@ int internal_pthread_create(void *th, void *attr, void *(*callback)(void *),
 }
 int internal_pthread_join(void *th, void **ret) {
   ScopedIgnoreInterceptors ignore;
-  return REAL(pthread_join(th, ret));
+  return REAL(pthread_join)(th, ret);
 }
 }  // namespace __sanitizer
 

@vitalybuka vitalybuka merged commit 89c8d68 into main Aug 7, 2024
8 of 9 checks passed
@vitalybuka vitalybuka deleted the users/vitalybuka/spr/nfc-fix-typo-in-realpthread_jointh-ret branch August 7, 2024 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants