summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/tsan/rtl
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2015-02-13 16:08:43 +0000
committerDmitry Vyukov <dvyukov@google.com>2015-02-13 16:08:43 +0000
commitb57e39e310fb8f25d19f0ec0b581b34710f34760 (patch)
treed64ac275537d510459bbad019f0508a0f5ed4c59 /compiler-rt/lib/tsan/rtl
parent9a7971131ebc13b5c63cde7b7dab306bc5ded137 (diff)
downloadbcm5719-llvm-b57e39e310fb8f25d19f0ec0b581b34710f34760.tar.gz
bcm5719-llvm-b57e39e310fb8f25d19f0ec0b581b34710f34760.zip
tsan: fix build
llvm-svn: 229120
Diffstat (limited to 'compiler-rt/lib/tsan/rtl')
-rw-r--r--compiler-rt/lib/tsan/rtl/tsan_rtl.h6
-rw-r--r--compiler-rt/lib/tsan/rtl/tsan_stat.cc5
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 a176e3f17fa..440d60ae2d5 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 ee02cece24f..203ee1d5f3b 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] = {};
OpenPOWER on IntegriCloud