This is an archive of the discontinued LLVM Phabricator instance.

Differential D119293

[sanitizer] Avoid dlsym reference for SANITIZER_GO builds
AbandonedPublic

Authored by MaskRay on Feb 8 2022, 2:41 PM.

Details

Reviewers
vitalybuka
fweimer
Group Reviewers
Restricted Project

Diff Detail

Event Timeline

fweimer requested review of this revision.Feb 8 2022, 2:41 PM
fweimer created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 8 2022, 2:41 PM
MaskRay added a comment.EditedFeb 8 2022, 2:53 PM

Thanks for taking care of the issue. I have hopefully (ninja check-tsan tests GotsanRuntimeCheck, but I otherwise know nothing about it) fixed the issue with f0cdacd99bd41dbd778099dfe303ba92660826b3. If it doesn't work, let's try this version...

Harbormaster completed remote builds in B148369: Diff 406982.Feb 8 2022, 3:11 PM
MaskRay commandeered this revision.Mar 10 2022, 12:01 AM
MaskRay edited reviewers, added: fweimer; removed: MaskRay.

Fixed for a while.

Herald added a project: Restricted Project. · View Herald TranscriptMar 10 2022, 12:01 AM
MaskRay abandoned this revision.Mar 10 2022, 12:01 AM

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
2 lines

Diff 406982

compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp

Show First 20 Lines • Show All 284 Lines • ▼ Show 20 Lines
#endif #endif
return val; return val;
} }
uptr ThreadDescriptorSize() { uptr ThreadDescriptorSize() {
uptr val = atomic_load_relaxed(&thread_descriptor_size); uptr val = atomic_load_relaxed(&thread_descriptor_size);
if (val) if (val)
return val; return val;
#if SANITIZER_GLIBC && !SANITIZER_GO
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-#if SANITIZER_GLIBC && !SANITIZER_GO
+#    if SANITIZER_GLIBC && !SANITIZER_GO
Lint: Pre-merge checks: clang-format: please reformat the code ``` -#if SANITIZER_GLIBC && !SANITIZER_GO +# if…
// _thread_db_sizeof_pthread is a GLIBC_PRIVATE symbol that is exported in // _thread_db_sizeof_pthread is a GLIBC_PRIVATE symbol that is exported in
// glibc 2.34 and later. // glibc 2.34 and later.
if (unsigned *psizeof = static_cast<unsigned *>( if (unsigned *psizeof = static_cast<unsigned *>(
dlsym(RTLD_DEFAULT, "_thread_db_sizeof_pthread"))) dlsym(RTLD_DEFAULT, "_thread_db_sizeof_pthread")))
val = *psizeof; val = *psizeof;
#endif
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-#endif
+#    endif
Lint: Pre-merge checks: clang-format: please reformat the code ``` -#endif +# endif ```
if (!val) if (!val)
val = ThreadDescriptorSizeFallback(); val = ThreadDescriptorSizeFallback();
atomic_store_relaxed(&thread_descriptor_size, val); atomic_store_relaxed(&thread_descriptor_size, val);
return val; return val;
} }
#if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64 #if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64
// TlsPreTcbSize includes size of struct pthread_descr and size of tcb // TlsPreTcbSize includes size of struct pthread_descr and size of tcb
▲ Show 20 Lines • Show All 734 Lines • Show Last 20 Lines