[compiler-rt] r229120 - tsan: fix build

[Dmitry Vyukov]

Author: dvyukov
Date: Fri Feb 13 10:08:43 2015
New Revision: 229120

URL: http://llvm.org/viewvc/llvm-project?rev=229120&view=rev
Log:
tsan: fix build


Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.h
    compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.h?rev=229120&r1=229119&r2=229120&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.h (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.h Fri Feb 13 10:08:43 2015
@@ -550,14 +550,12 @@ void StatOutput(u64 *stat);
 
 void ALWAYS_INLINE StatInc(ThreadState *thr, StatType typ, u64 n = 1) {
 #ifdef TSAN_COLLECT_STATS
-  if (kCollectStats)
-    thr->stat[typ] += n;
+  thr->stat[typ] += n;
 #endif
 }
 void ALWAYS_INLINE StatSet(ThreadState *thr, StatType typ, u64 n) {
 #ifdef TSAN_COLLECT_STATS
-  if (kCollectStats)
-    thr->stat[typ] = n;
+  thr->stat[typ] = n;
 #endif
 }
 

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc?rev=229120&r1=229119&r2=229120&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc Fri Feb 13 10:08:43 2015
@@ -18,16 +18,11 @@ namespace __tsan {
 #ifdef TSAN_COLLECT_STATS
 
 void StatAggregate(u64 *dst, u64 *src) {
-  if (!kCollectStats)
-    return;
   for (int i = 0; i < StatCnt; i++)
     dst[i] += src[i];
 }
 
 void StatOutput(u64 *stat) {
-  if (!kCollectStats)
-    return;
-
   stat[StatShadowNonZero] = stat[StatShadowProcessed] - stat[StatShadowZero];
 
   static const char *name[StatCnt] = {};