1 files changed, 3 insertions, 7 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
index 3efe4524a77..3cab7a83804 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
@@ -23,10 +23,10 @@
 #include "tsan_mman.h"
 #include "tsan_flags.h"
 
-namespace __sanitizer {
-using namespace __tsan;
+namespace __tsan {
 
-void CheckFailed(const char *file, int line, const char *cond, u64 v1, u64 v2) {
+void TsanCheckFailed(const char *file, int line, const char *cond,
+                     u64 v1, u64 v2) {
   ScopedInRtl in_rtl;
   TsanPrintf("FATAL: ThreadSanitizer CHECK failed: "
              "%s:%d \"%s\" (0x%zx, 0x%zx)\n",
@@ -34,10 +34,6 @@ void CheckFailed(const char *file, int line, const char *cond, u64 v1, u64 v2) {
   Die();
 }
 
-}  // namespace __sanitizer
-
-namespace __tsan {
-
 // Can be overriden by an application/test to intercept reports.
 #ifdef TSAN_EXTERNAL_HOOKS
 bool OnReport(const ReportDesc *rep, bool suppressed);