diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2017-03-21 15:31:15 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2017-03-21 15:31:15 +0000 |
| commit | 9ede2ebf28902cdeadca20a5ff279082b8ba4cd7 (patch) | |
| tree | 03520f34bc496d27aa66d8a17f7d9cc1c8645dac /lib/lsan/lsan_common_linux.cc | |
| parent | 8f117382b967d5e5c4f27a10477de1ea65b76be1 (diff) | |
| download | compiler-rt-9ede2ebf28902cdeadca20a5ff279082b8ba4cd7.tar.gz | |
Revert r298274: "Use pthreads for thread-local lsan allocator cache on darwin"
This fixes a failure currently present on the upstream linux boxes (and
reproduces for me as well):
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/1130/steps/64-bit%20check-asan-dynamic/logs/stdio
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@298382 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/lsan/lsan_common_linux.cc')
| -rw-r--r-- | lib/lsan/lsan_common_linux.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/lsan/lsan_common_linux.cc b/lib/lsan/lsan_common_linux.cc index e73768e58..0e10d4191 100644 --- a/lib/lsan/lsan_common_linux.cc +++ b/lib/lsan/lsan_common_linux.cc @@ -22,7 +22,6 @@ #include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_linux.h" #include "sanitizer_common/sanitizer_stackdepot.h" -#include "lsan_allocator.h" namespace __lsan { @@ -39,9 +38,6 @@ static THREADLOCAL u32 current_thread_tid = kInvalidTid; u32 GetCurrentThread() { return current_thread_tid; } void SetCurrentThread(u32 tid) { current_thread_tid = tid; } -static THREADLOCAL AllocatorCache allocator_cache; -AllocatorCache *GetAllocatorCache() { return &allocator_cache; } - __attribute__((tls_model("initial-exec"))) THREADLOCAL int disable_counter; bool DisabledInThisThread() { return disable_counter > 0; } |