diff --git a/compiler-rt/lib/tsan/go/test.c b/compiler-rt/lib/tsan/go/test.c
--- a/compiler-rt/lib/tsan/go/test.c
+++ b/compiler-rt/lib/tsan/go/test.c
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Sanity test for Go runtime.
+// Test for Go runtime.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/compiler-rt/lib/tsan/rtl-old/CMakeLists.txt b/compiler-rt/lib/tsan/rtl-old/CMakeLists.txt
--- a/compiler-rt/lib/tsan/rtl-old/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/rtl-old/CMakeLists.txt
@@ -172,7 +172,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_amd64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
         COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -186,7 +186,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_aarch64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -200,7 +200,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_ppc64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -218,7 +218,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_s390x.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
diff --git a/compiler-rt/lib/tsan/rtl-old/tsan_flags.cpp b/compiler-rt/lib/tsan/rtl-old/tsan_flags.cpp
--- a/compiler-rt/lib/tsan/rtl-old/tsan_flags.cpp
+++ b/compiler-rt/lib/tsan/rtl-old/tsan_flags.cpp
@@ -97,7 +97,7 @@
   ubsan_parser.ParseStringFromEnv("UBSAN_OPTIONS");
 #endif
 
-  // Sanity check.
+  // Check flags.
   if (!f->report_bugs) {
     f->report_thread_leaks = false;
     f->report_destroy_locked = false;
diff --git a/compiler-rt/lib/tsan/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/rtl/CMakeLists.txt
--- a/compiler-rt/lib/tsan/rtl/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/rtl/CMakeLists.txt
@@ -169,7 +169,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_amd64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
         COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -183,7 +183,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_aarch64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -197,7 +197,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_ppc64.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
@@ -215,7 +215,7 @@
       add_asm_sources(TSAN_ASM_SOURCES
         tsan_rtl_s390x.S
         )
-      # Sanity check for Go runtime.
+      # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
 	COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.cpp b/compiler-rt/lib/tsan/rtl/tsan_flags.cpp
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.cpp
@@ -97,7 +97,7 @@
   ubsan_parser.ParseStringFromEnv("UBSAN_OPTIONS");
 #endif
 
-  // Sanity check.
+  // Check flags.
   if (!f->report_bugs) {
     f->report_thread_leaks = false;
     f->report_destroy_locked = false;
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
@@ -936,7 +936,7 @@
     // Pathologically large stacks may not fit into the part.
     // In these cases we log only fixed number of top frames.
     const uptr kMaxFrames = 1000;
-    // Sanity check that kMaxFrames won't consume the whole part.
+    // Check that kMaxFrames won't consume the whole part.
     static_assert(kMaxFrames < TracePart::kSize / 2, "kMaxFrames is too big");
     uptr* pos = Max(&thr->shadow_stack[0], thr->shadow_stack_pos - kMaxFrames);
     for (; pos < thr->shadow_stack_pos; pos++) {