From b57e39e310fb8f25d19f0ec0b581b34710f34760 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 13 Feb 2015 16:08:43 +0000 Subject: [PATCH] tsan: fix build llvm-svn: 229120 --- compiler-rt/lib/tsan/rtl/tsan_rtl.h | 6 ++---- compiler-rt/lib/tsan/rtl/tsan_stat.cc | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h index a176e3f..440d60a 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h @@ -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 } diff --git a/compiler-rt/lib/tsan/rtl/tsan_stat.cc b/compiler-rt/lib/tsan/rtl/tsan_stat.cc index ee02cec..203ee1d 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_stat.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_stat.cc @@ -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] = {}; -- 2.7.4