diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2015-11-13 20:45:27 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2015-11-13 20:45:27 +0000 |
| commit | 693df74a1a33541d4e2a97b5c4ee38c4289ca11e (patch) | |
| tree | 0d858264116a425ad51a55af554ce30de22317e3 /lib/tsan/rtl/tsan_platform_mac.cc | |
| parent | 2da8611305814541b3ef01dcce2b36f425b3ac03 (diff) | |
[tsan] Fix finalization of detached threads on OS X
Currently, we crash on finalization of detached threads, because we'll try to clear the ThreadState twice.
Differential Revision: http://reviews.llvm.org/D14644
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@253079 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/rtl/tsan_platform_mac.cc')
| -rw-r--r-- | lib/tsan/rtl/tsan_platform_mac.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tsan/rtl/tsan_platform_mac.cc b/lib/tsan/rtl/tsan_platform_mac.cc index 5a8950a08..7c224bcdc 100644 --- a/lib/tsan/rtl/tsan_platform_mac.cc +++ b/lib/tsan/rtl/tsan_platform_mac.cc @@ -139,7 +139,7 @@ static void my_pthread_introspection_hook(unsigned int event, pthread_t thread, } } else if (event == PTHREAD_INTROSPECTION_THREAD_DESTROY) { ThreadState *thr = cur_thread(); - if (thr->tctx->parent_tid == kInvalidTid) { + if (thr->tctx && thr->tctx->parent_tid == kInvalidTid) { DestroyThreadState(); } } |