tsan: add a flag to control RunningOnValgrind() return value

llvm-svn: 157383

3 files changed, 5 insertions, 1 deletions

diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.cc b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
index b7f604ac06e..24398872b97 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
@@ -49,6 +49,8 @@ void InitializeFlags(Flags *f, const char *env) {
   f->profile_memory = "";
   f->flush_memory_ms = 0;
   f->stop_on_start = false;
+  f->running_on_valgrind = false;
+
 
   // Let a frontend override.
   OverrideFlags(f);
diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.h b/compiler-rt/lib/tsan/rtl/tsan_flags.h
index dea01417ffe..6c516ed0b22 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.h
@@ -52,6 +52,8 @@ struct Flags {
   int flush_memory_ms;
   // Stops on start until __tsan_resume() is called (for debugging).
   bool stop_on_start;
+  // Controls whether RunningOnValgrind() returns true or false.
+  bool running_on_valgrind;
 };
 
 Flags *flags();
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc b/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
index c68e1d51a07..a04a207b5fe 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
@@ -332,7 +332,7 @@ void WTFAnnotateBenignRaceSized(char *f, int l, uptr mem, uptr sz, char *desc) {
 }
 
 int RunningOnValgrind() {
-  return 0;
+  return flags()->running_on_valgrind;
 }
 
 double __attribute__((weak)) ValgrindSlowdown(void) {