diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-05-29 16:25:57 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-05-29 16:25:57 +0000 |
| commit | 224c1c721b03784d0da2af00884ea8d4eb7a1650 (patch) | |
| tree | ac9e50e358e85ab37022d6fdafaa0c8dbb4adad2 /lib/tsan/rtl/tsan_rtl_thread.cc | |
| parent | 99ea5e489fa5765bf0eb50ca4261ab5cc20abeeb (diff) | |
Diffstat (limited to 'lib/tsan/rtl/tsan_rtl_thread.cc')
| -rw-r--r-- | lib/tsan/rtl/tsan_rtl_thread.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/tsan/rtl/tsan_rtl_thread.cc b/lib/tsan/rtl/tsan_rtl_thread.cc index 6a0943c49588..edb60980c76f 100644 --- a/lib/tsan/rtl/tsan_rtl_thread.cc +++ b/lib/tsan/rtl/tsan_rtl_thread.cc @@ -248,19 +248,7 @@ void ThreadStart(ThreadState *thr, int tid, tid_t os_id, bool workerthread) { if (stk_addr && stk_size) MemoryRangeImitateWrite(thr, /*pc=*/ 1, stk_addr, stk_size); - if (tls_addr && tls_size) { - // Check that the thr object is in tls; - const uptr thr_beg = (uptr)thr; - const uptr thr_end = (uptr)thr + sizeof(*thr); - CHECK_GE(thr_beg, tls_addr); - CHECK_LE(thr_beg, tls_addr + tls_size); - CHECK_GE(thr_end, tls_addr); - CHECK_LE(thr_end, tls_addr + tls_size); - // Since the thr object is huge, skip it. - MemoryRangeImitateWrite(thr, /*pc=*/ 2, tls_addr, thr_beg - tls_addr); - MemoryRangeImitateWrite(thr, /*pc=*/ 2, - thr_end, tls_addr + tls_size - thr_end); - } + if (tls_addr && tls_size) ImitateTlsWrite(thr, tls_addr, tls_size); } #endif |