diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:20:59 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:20:59 +0000 |
commit | f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d (patch) | |
tree | a1af403c7ce4e7447ee7e01c045d260dba9a409b /lib/asan/asan_thread.cc | |
parent | ab0bf875a5f328a6710f4e48258979ae1bc8da1c (diff) | |
download | src-f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d.tar.gz src-f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d.zip |
Vendor import of compiler-rt trunk r300890:vendor/compiler-rt/compiler-rt-trunk-r300890
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=317222
svn path=/vendor/compiler-rt/compiler-rt-trunk-r300890/; revision=317223; tag=vendor/compiler-rt/compiler-rt-trunk-r300890
Diffstat (limited to 'lib/asan/asan_thread.cc')
-rw-r--r-- | lib/asan/asan_thread.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/asan/asan_thread.cc b/lib/asan/asan_thread.cc index aaa32d6ea6da..f41ee2df2d96 100644 --- a/lib/asan/asan_thread.cc +++ b/lib/asan/asan_thread.cc @@ -237,7 +237,7 @@ void AsanThread::Init() { } thread_return_t AsanThread::ThreadStart( - uptr os_id, atomic_uintptr_t *signal_thread_is_registered) { + tid_t os_id, atomic_uintptr_t *signal_thread_is_registered) { Init(); asanThreadRegistry().StartThread(tid(), os_id, /*workerthread*/ false, nullptr); @@ -395,7 +395,7 @@ void EnsureMainThreadIDIsCorrect() { context->os_id = GetTid(); } -__asan::AsanThread *GetAsanThreadByOsIDLocked(uptr os_id) { +__asan::AsanThread *GetAsanThreadByOsIDLocked(tid_t os_id) { __asan::AsanThreadContext *context = static_cast<__asan::AsanThreadContext *>( __asan::asanThreadRegistry().FindThreadContextByOsIDLocked(os_id)); if (!context) return nullptr; @@ -405,7 +405,7 @@ __asan::AsanThread *GetAsanThreadByOsIDLocked(uptr os_id) { // --- Implementation of LSan-specific functions --- {{{1 namespace __lsan { -bool GetThreadRangesLocked(uptr os_id, uptr *stack_begin, uptr *stack_end, +bool GetThreadRangesLocked(tid_t os_id, uptr *stack_begin, uptr *stack_end, uptr *tls_begin, uptr *tls_end, uptr *cache_begin, uptr *cache_end, DTLS **dtls) { __asan::AsanThread *t = __asan::GetAsanThreadByOsIDLocked(os_id); @@ -421,7 +421,7 @@ bool GetThreadRangesLocked(uptr os_id, uptr *stack_begin, uptr *stack_end, return true; } -void ForEachExtraStackRange(uptr os_id, RangeIteratorCallback callback, +void ForEachExtraStackRange(tid_t os_id, RangeIteratorCallback callback, void *arg) { __asan::AsanThread *t = __asan::GetAsanThreadByOsIDLocked(os_id); if (t && t->has_fake_stack()) |