[compiler-rt] r210345 - tsan: fix Go build with TSAN_COLLECT_STATS

Dmitry Vyukov dvyukov at google.com
Fri Jun 6 08:50:29 PDT 2014


Author: dvyukov
Date: Fri Jun  6 10:50:29 2014
New Revision: 210345

URL: http://llvm.org/viewvc/llvm-project?rev=210345&view=rev
Log:
tsan: fix Go build with TSAN_COLLECT_STATS
Go does not have cur_thread function.


Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_mutex.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_mutex.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_mutex.cc?rev=210345&r1=210344&r2=210345&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_mutex.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_mutex.cc Fri Jun  6 10:50:29 2014
@@ -234,7 +234,7 @@ void Mutex::Lock() {
       cmp = kUnlocked;
       if (atomic_compare_exchange_weak(&state_, &cmp, kWriteLock,
                                        memory_order_acquire)) {
-#if TSAN_COLLECT_STATS
+#if TSAN_COLLECT_STATS && !TSAN_GO
         StatInc(cur_thread(), stat_type_, backoff.Contention());
 #endif
         return;
@@ -262,7 +262,7 @@ void Mutex::ReadLock() {
   for (Backoff backoff; backoff.Do();) {
     prev = atomic_load(&state_, memory_order_acquire);
     if ((prev & kWriteLock) == 0) {
-#if TSAN_COLLECT_STATS
+#if TSAN_COLLECT_STATS && !TSAN_GO
       StatInc(cur_thread(), stat_type_, backoff.Contention());
 #endif
       return;





More information about the llvm-commits mailing list