Skip to content

Update compiler-rt to LLVM 17.0.4 #20708

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.

Sign up for GitHub

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
aheejin merged 12 commits into from
Nov 16, 2023
Merged

Update compiler-rt to LLVM 17.0.4 #20708

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
807d63a
Update compiler-rt to LLVM 17.0.4
aheejin Nov 14, 2023
959984d
Exclude crtbegin.c / crtend.c
aheejin Nov 14, 2023
4ee3a2f
Disable asm redefinition of sanitizer symbols
aheejin Nov 2, 2023
95b0441
lsan fixes
aheejin Nov 3, 2023
14fad4c
Fix pthread_exit's interceptor's return type
aheejin Nov 3, 2023
7fd9a23
Add declaration & aliases for emscripten_builtin_pthread_exit
aheejin Nov 3, 2023
19f4a18
Don't run internal_mprotect in Emscripten
aheejin Nov 3, 2023
1e38f33
Call pthread_attr_getdetachstate after pthread_attr_init
aheejin Nov 8, 2023
f1cf73f
Update readme.txt
aheejin Nov 14, 2023
c4d31ec
Merge branch 'main' into llvm_17_compiler_rt
aheejin Nov 16, 2023
9c54033
Merge branch 'main' into llvm_17_compiler_rt
aheejin Nov 16, 2023
9254a85
Address a comment
aheejin Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions system/lib/compiler-rt/lib/lsan/lsan_interceptors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,17 +453,32 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr,
ENSURE_LSAN_INITED;
EnsureMainThreadIDIsCorrect();

#if !SANITIZER_EMSCRIPTEN
Copy link
Collaborator

@sbc100 sbc100 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if could just have a single if at the top of this function?

#if !SANITIZER_EMSCRIPTEN
// Treat __ATTRP_C11_THREAD like the null attr
if (attr == __ATTRP_C11_THREAD) attr = nullptr;
#endif

Copy link
Member Author

@aheejin aheejin Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea. Btw you meant #if SANITIZER_EMSCRIPTEN (without !), right?

Copy link
Collaborator

@sbc100 sbc100 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup

bool detached = [attr]() {
int d = 0;
return attr && !pthread_attr_getdetachstate(attr, &d) && IsStateDetached(d);
}();
#endif

__sanitizer_pthread_attr_t myattr;
#if SANITIZER_EMSCRIPTEN
if (!attr || attr == __ATTRP_C11_THREAD) {
#else
if (!attr) {
#endif
pthread_attr_init(&myattr);
attr = &myattr;
}
AdjustStackSize(attr);
#if SANITIZER_EMSCRIPTEN
// In Emscripten sanitizer, attr can be nonzero but __ATTRP_C11_THREAD, in
// which case pthread_attr_getdetachstate needs to run after pthread_attr_init
// above.
bool detached = [attr]() {
int d = 0;
return attr && !pthread_attr_getdetachstate(attr, &d) && IsStateDetached(d);
}();
#endif
uptr this_tid = GetCurrentThreadId();
int result;
{
Expand Down