compiler-rt: Rename .cc file in test/tsan to .cpp

Like r367463, but for test/tsan.

llvm-svn: 367656

236 files changed, 48 insertions, 48 deletions

diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index 00d811a5b69..ad608f8cb33 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -94,7 +94,7 @@ run_lint ${TSAN_RTL_LINT_FILTER} ${TSAN_RTL}/rtl/*.cpp \
 run_lint ${TSAN_TEST_LINT_FILTER} ${TSAN_RTL}/tests/rtl/*.cpp \
                                   ${TSAN_RTL}/tests/rtl/*.h \
                                   ${TSAN_RTL}/tests/unit/*.cpp &
-run_lint ${TSAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/tsan/*.cc &
+run_lint ${TSAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/tsan/*.cpp &
 
 # MSan
 MSAN_RTL=${COMPILER_RT}/lib/msan
diff --git a/compiler-rt/test/tsan/Darwin/debug_external.cc b/compiler-rt/test/tsan/Darwin/debug_external.cpp
index 2418a271b23..2418a271b23 100644
--- a/compiler-rt/test/tsan/Darwin/debug_external.cc
+++ b/compiler-rt/test/tsan/Darwin/debug_external.cpp
diff --git a/compiler-rt/test/tsan/Darwin/dlopen.cc b/compiler-rt/test/tsan/Darwin/dlopen.cpp
index 3d12b815f9c..3d12b815f9c 100644
--- a/compiler-rt/test/tsan/Darwin/dlopen.cc
+++ b/compiler-rt/test/tsan/Darwin/dlopen.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external-dups.cc b/compiler-rt/test/tsan/Darwin/external-dups.cpp
index ca1eb3e7cc4..ca1eb3e7cc4 100644
--- a/compiler-rt/test/tsan/Darwin/external-dups.cc
+++ b/compiler-rt/test/tsan/Darwin/external-dups.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc b/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cpp
index d2acaf54b26..916b0b893fc 100644
--- a/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc
+++ b/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cpp
@@ -1,7 +1,7 @@
-// RUN: %clangxx_tsan -shared %p/external-lib.cc -fno-sanitize=thread -DUSE_TSAN_CALLBACKS \
+// RUN: %clangxx_tsan -shared %p/external-lib.cpp -fno-sanitize=thread -DUSE_TSAN_CALLBACKS \
 // RUN:   -o %t-lib.dylib -install_name @rpath/`basename %t-lib.dylib`
 
-// RUN: %clangxx_tsan -shared %p/external-noninstrumented-module.cc %t-lib.dylib -fno-sanitize=thread \
+// RUN: %clangxx_tsan -shared %p/external-noninstrumented-module.cpp %t-lib.dylib -fno-sanitize=thread \
 // RUN:   -o %t-module.dylib -install_name @rpath/`basename %t-module.dylib`
 
 // RUN: %clangxx_tsan %s %t-module.dylib -o %t
diff --git a/compiler-rt/test/tsan/Darwin/external-lib.cc b/compiler-rt/test/tsan/Darwin/external-lib.cpp
index f0afdf1dc06..f0afdf1dc06 100644
--- a/compiler-rt/test/tsan/Darwin/external-lib.cc
+++ b/compiler-rt/test/tsan/Darwin/external-lib.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external-noninstrumented-module.cc b/compiler-rt/test/tsan/Darwin/external-noninstrumented-module.cpp
index ce65970834e..ce65970834e 100644
--- a/compiler-rt/test/tsan/Darwin/external-noninstrumented-module.cc
+++ b/compiler-rt/test/tsan/Darwin/external-noninstrumented-module.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external-swift-debugging.cc b/compiler-rt/test/tsan/Darwin/external-swift-debugging.cpp
index 603734e5d03..603734e5d03 100644
--- a/compiler-rt/test/tsan/Darwin/external-swift-debugging.cc
+++ b/compiler-rt/test/tsan/Darwin/external-swift-debugging.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external-swift.cc b/compiler-rt/test/tsan/Darwin/external-swift.cpp
index f6f9e7f4ece..f6f9e7f4ece 100644
--- a/compiler-rt/test/tsan/Darwin/external-swift.cc
+++ b/compiler-rt/test/tsan/Darwin/external-swift.cpp
diff --git a/compiler-rt/test/tsan/Darwin/external.cc b/compiler-rt/test/tsan/Darwin/external.cpp
index e72281afa48..3869c7abb76 100644
--- a/compiler-rt/test/tsan/Darwin/external.cc
+++ b/compiler-rt/test/tsan/Darwin/external.cpp
@@ -1,12 +1,12 @@
-// RUN: %clangxx_tsan %p/external-lib.cc -shared \
+// RUN: %clangxx_tsan %p/external-lib.cpp -shared \
 // RUN:                               -o %t-lib-instrumented.dylib \
 // RUN:   -install_name @rpath/`basename %t-lib-instrumented.dylib`
 
-// RUN: %clangxx_tsan %p/external-lib.cc -shared -fno-sanitize=thread \
+// RUN: %clangxx_tsan %p/external-lib.cpp -shared -fno-sanitize=thread \
 // RUN:                               -o %t-lib-noninstrumented.dylib \
 // RUN:   -install_name @rpath/`basename %t-lib-noninstrumented.dylib`
 
-// RUN: %clangxx_tsan %p/external-lib.cc -shared -fno-sanitize=thread -DUSE_TSAN_CALLBACKS \
+// RUN: %clangxx_tsan %p/external-lib.cpp -shared -fno-sanitize=thread -DUSE_TSAN_CALLBACKS \
 // RUN:                               -o %t-lib-noninstrumented-callbacks.dylib \
 // RUN:   -install_name @rpath/`basename %t-lib-noninstrumented-callbacks.dylib`
 
diff --git a/compiler-rt/test/tsan/Darwin/malloc-stack-logging.cc b/compiler-rt/test/tsan/Darwin/malloc-stack-logging.cpp
index 8d9c2122d0e..8d9c2122d0e 100644
--- a/compiler-rt/test/tsan/Darwin/malloc-stack-logging.cc
+++ b/compiler-rt/test/tsan/Darwin/malloc-stack-logging.cpp
diff --git a/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc b/compiler-rt/test/tsan/Darwin/osspinlock-norace.cpp
index 5de02c225f0..5de02c225f0 100644
--- a/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc
+++ b/compiler-rt/test/tsan/Darwin/osspinlock-norace.cpp
diff --git a/compiler-rt/test/tsan/Darwin/realloc-zero.cc b/compiler-rt/test/tsan/Darwin/realloc-zero.cpp
index 98262463cb2..98262463cb2 100644
--- a/compiler-rt/test/tsan/Darwin/realloc-zero.cc
+++ b/compiler-rt/test/tsan/Darwin/realloc-zero.cpp
diff --git a/compiler-rt/test/tsan/Darwin/signals-blocked.cc b/compiler-rt/test/tsan/Darwin/signals-blocked.cpp
index 209dc2229ff..209dc2229ff 100644
--- a/compiler-rt/test/tsan/Darwin/signals-blocked.cc
+++ b/compiler-rt/test/tsan/Darwin/signals-blocked.cpp
diff --git a/compiler-rt/test/tsan/Darwin/symbolizer-atos.cc b/compiler-rt/test/tsan/Darwin/symbolizer-atos.cpp
index 960fecc9864..960fecc9864 100644
--- a/compiler-rt/test/tsan/Darwin/symbolizer-atos.cc
+++ b/compiler-rt/test/tsan/Darwin/symbolizer-atos.cpp
diff --git a/compiler-rt/test/tsan/Darwin/symbolizer-dladdr.cc b/compiler-rt/test/tsan/Darwin/symbolizer-dladdr.cpp
index 3b213dda85d..3b213dda85d 100644
--- a/compiler-rt/test/tsan/Darwin/symbolizer-dladdr.cc
+++ b/compiler-rt/test/tsan/Darwin/symbolizer-dladdr.cpp
diff --git a/compiler-rt/test/tsan/Linux/check_preinit.cc b/compiler-rt/test/tsan/Linux/check_preinit.cpp
index 8f5bf403376..8f5bf403376 100644
--- a/compiler-rt/test/tsan/Linux/check_preinit.cc
+++ b/compiler-rt/test/tsan/Linux/check_preinit.cpp
diff --git a/compiler-rt/test/tsan/Linux/double_race.cc b/compiler-rt/test/tsan/Linux/double_race.cpp
index 5b15dccd747..963619cf9a8 100644
--- a/compiler-rt/test/tsan/Linux/double_race.cc
+++ b/compiler-rt/test/tsan/Linux/double_race.cpp
@@ -3,7 +3,7 @@
 #include <memory.h>
 
 // A reproducer for a known issue.
-// See reference to double_race.cc in tsan_rtl_report.cpp for an explanation.
+// See reference to double_race.cpp in tsan_rtl_report.cpp for an explanation.
 
 char buf[16];
 volatile int nreport;
diff --git a/compiler-rt/test/tsan/Linux/mutex_robust.cc b/compiler-rt/test/tsan/Linux/mutex_robust.cpp
index 5ca5e70d49a..5ca5e70d49a 100644
--- a/compiler-rt/test/tsan/Linux/mutex_robust.cc
+++ b/compiler-rt/test/tsan/Linux/mutex_robust.cpp
diff --git a/compiler-rt/test/tsan/Linux/mutex_robust2.cc b/compiler-rt/test/tsan/Linux/mutex_robust2.cpp
index 0914c176360..0914c176360 100644
--- a/compiler-rt/test/tsan/Linux/mutex_robust2.cc
+++ b/compiler-rt/test/tsan/Linux/mutex_robust2.cpp
diff --git a/compiler-rt/test/tsan/Linux/pie_no_aslr.cc b/compiler-rt/test/tsan/Linux/pie_no_aslr.cpp
index b99342da06b..b99342da06b 100644
--- a/compiler-rt/test/tsan/Linux/pie_no_aslr.cc
+++ b/compiler-rt/test/tsan/Linux/pie_no_aslr.cpp
diff --git a/compiler-rt/test/tsan/Linux/user_fopen.cc b/compiler-rt/test/tsan/Linux/user_fopen.cpp
index c0ff267ff88..c0ff267ff88 100644
--- a/compiler-rt/test/tsan/Linux/user_fopen.cc
+++ b/compiler-rt/test/tsan/Linux/user_fopen.cpp
diff --git a/compiler-rt/test/tsan/Linux/user_malloc.cc b/compiler-rt/test/tsan/Linux/user_malloc.cpp
index fbe023dda18..fbe023dda18 100644
--- a/compiler-rt/test/tsan/Linux/user_malloc.cc
+++ b/compiler-rt/test/tsan/Linux/user_malloc.cpp
diff --git a/compiler-rt/test/tsan/aligned_vs_unaligned_race.cc b/compiler-rt/test/tsan/aligned_vs_unaligned_race.cpp
index fb299da8e72..fb299da8e72 100644
--- a/compiler-rt/test/tsan/aligned_vs_unaligned_race.cc
+++ b/compiler-rt/test/tsan/aligned_vs_unaligned_race.cpp
diff --git a/compiler-rt/test/tsan/annotate_happens_before.cc b/compiler-rt/test/tsan/annotate_happens_before.cpp
index 011661699a7..011661699a7 100644
--- a/compiler-rt/test/tsan/annotate_happens_before.cc
+++ b/compiler-rt/test/tsan/annotate_happens_before.cpp
diff --git a/compiler-rt/test/tsan/atexit.cc b/compiler-rt/test/tsan/atexit.cpp
index 69acb4dd783..69acb4dd783 100644
--- a/compiler-rt/test/tsan/atexit.cc
+++ b/compiler-rt/test/tsan/atexit.cpp
diff --git a/compiler-rt/test/tsan/atexit2.cc b/compiler-rt/test/tsan/atexit2.cpp
index 6f74c5f9f6e..6f74c5f9f6e 100644
--- a/compiler-rt/test/tsan/atexit2.cc
+++ b/compiler-rt/test/tsan/atexit2.cpp
diff --git a/compiler-rt/test/tsan/atexit3.cc b/compiler-rt/test/tsan/atexit3.cpp
index 43ba5bbf691..43ba5bbf691 100644
--- a/compiler-rt/test/tsan/atexit3.cc
+++ b/compiler-rt/test/tsan/atexit3.cpp
diff --git a/compiler-rt/test/tsan/atomic_free.cc b/compiler-rt/test/tsan/atomic_free.cpp
index 446949ddb98..446949ddb98 100644
--- a/compiler-rt/test/tsan/atomic_free.cc
+++ b/compiler-rt/test/tsan/atomic_free.cpp
diff --git a/compiler-rt/test/tsan/atomic_free2.cc b/compiler-rt/test/tsan/atomic_free2.cpp
index 4a9f268a400..4a9f268a400 100644
--- a/compiler-rt/test/tsan/atomic_free2.cc
+++ b/compiler-rt/test/tsan/atomic_free2.cpp
diff --git a/compiler-rt/test/tsan/atomic_free3.cc b/compiler-rt/test/tsan/atomic_free3.cpp
index f2875aeb656..f2875aeb656 100644
--- a/compiler-rt/test/tsan/atomic_free3.cc
+++ b/compiler-rt/test/tsan/atomic_free3.cpp
diff --git a/compiler-rt/test/tsan/atomic_hle.cc b/compiler-rt/test/tsan/atomic_hle.cpp
index 345e363c2bc..345e363c2bc 100644
--- a/compiler-rt/test/tsan/atomic_hle.cc
+++ b/compiler-rt/test/tsan/atomic_hle.cpp
diff --git a/compiler-rt/test/tsan/atomic_norace.cc b/compiler-rt/test/tsan/atomic_norace.cpp
index 625109b1fe6..625109b1fe6 100644
--- a/compiler-rt/test/tsan/atomic_norace.cc
+++ b/compiler-rt/test/tsan/atomic_norace.cpp
diff --git a/compiler-rt/test/tsan/atomic_race.cc b/compiler-rt/test/tsan/atomic_race.cpp
index 5a0317c4acf..5a0317c4acf 100644
--- a/compiler-rt/test/tsan/atomic_race.cc
+++ b/compiler-rt/test/tsan/atomic_race.cpp
diff --git a/compiler-rt/test/tsan/atomic_stack.cc b/compiler-rt/test/tsan/atomic_stack.cpp
index 979eaea8b69..979eaea8b69 100644
--- a/compiler-rt/test/tsan/atomic_stack.cc
+++ b/compiler-rt/test/tsan/atomic_stack.cpp
diff --git a/compiler-rt/test/tsan/atomic_store.cc b/compiler-rt/test/tsan/atomic_store.cpp
index 7ff4879d3ca..7ff4879d3ca 100644
--- a/compiler-rt/test/tsan/atomic_store.cc
+++ b/compiler-rt/test/tsan/atomic_store.cpp
diff --git a/compiler-rt/test/tsan/barrier.cc b/compiler-rt/test/tsan/barrier.cpp
index de2756de2a1..de2756de2a1 100644
--- a/compiler-rt/test/tsan/barrier.cc
+++ b/compiler-rt/test/tsan/barrier.cpp
diff --git a/compiler-rt/test/tsan/bench_acquire_only.cc b/compiler-rt/test/tsan/bench_acquire_only.cpp
index 0ed21b4612a..0ed21b4612a 100644
--- a/compiler-rt/test/tsan/bench_acquire_only.cc
+++ b/compiler-rt/test/tsan/bench_acquire_only.cpp
diff --git a/compiler-rt/test/tsan/bench_acquire_release.cc b/compiler-rt/test/tsan/bench_acquire_release.cpp
index 3799452a162..3799452a162 100644
--- a/compiler-rt/test/tsan/bench_acquire_release.cc
+++ b/compiler-rt/test/tsan/bench_acquire_release.cpp
diff --git a/compiler-rt/test/tsan/bench_local_mutex.cc b/compiler-rt/test/tsan/bench_local_mutex.cpp
index 15f83bc8b28..15f83bc8b28 100644
--- a/compiler-rt/test/tsan/bench_local_mutex.cc
+++ b/compiler-rt/test/tsan/bench_local_mutex.cpp
diff --git a/compiler-rt/test/tsan/bench_mutex.cc b/compiler-rt/test/tsan/bench_mutex.cpp
index 58aa86a787d..58aa86a787d 100644
--- a/compiler-rt/test/tsan/bench_mutex.cc
+++ b/compiler-rt/test/tsan/bench_mutex.cpp
diff --git a/compiler-rt/test/tsan/bench_release_only.cc b/compiler-rt/test/tsan/bench_release_only.cpp
index 7f26041afc4..7f26041afc4 100644
--- a/compiler-rt/test/tsan/bench_release_only.cc
+++ b/compiler-rt/test/tsan/bench_release_only.cpp
diff --git a/compiler-rt/test/tsan/bench_rwmutex.cc b/compiler-rt/test/tsan/bench_rwmutex.cpp
index 2b3dcb012e5..2b3dcb012e5 100644
--- a/compiler-rt/test/tsan/bench_rwmutex.cc
+++ b/compiler-rt/test/tsan/bench_rwmutex.cpp
diff --git a/compiler-rt/test/tsan/bench_shadow_flush.cc b/compiler-rt/test/tsan/bench_shadow_flush.cpp
index 0f412bbe82f..0f412bbe82f 100644
--- a/compiler-rt/test/tsan/bench_shadow_flush.cc
+++ b/compiler-rt/test/tsan/bench_shadow_flush.cpp
diff --git a/compiler-rt/test/tsan/bench_single_writer.cc b/compiler-rt/test/tsan/bench_single_writer.cpp
index 3d2ea150b5f..3d2ea150b5f 100644
--- a/compiler-rt/test/tsan/bench_single_writer.cc
+++ b/compiler-rt/test/tsan/bench_single_writer.cpp
diff --git a/compiler-rt/test/tsan/bench_ten_mutexes.cc b/compiler-rt/test/tsan/bench_ten_mutexes.cpp
index e7fa05ea820..e7fa05ea820 100644
--- a/compiler-rt/test/tsan/bench_ten_mutexes.cc
+++ b/compiler-rt/test/tsan/bench_ten_mutexes.cpp
diff --git a/compiler-rt/test/tsan/benign_race.cc b/compiler-rt/test/tsan/benign_race.cpp
index 90722aa9315..90722aa9315 100644
--- a/compiler-rt/test/tsan/benign_race.cc
+++ b/compiler-rt/test/tsan/benign_race.cpp
diff --git a/compiler-rt/test/tsan/blacklist.cc b/compiler-rt/test/tsan/blacklist.cpp
index c1bcca60d50..c1bcca60d50 100644
--- a/compiler-rt/test/tsan/blacklist.cc
+++ b/compiler-rt/test/tsan/blacklist.cpp
diff --git a/compiler-rt/test/tsan/blacklist2.cc b/compiler-rt/test/tsan/blacklist2.cpp
index bf6c4eb75b6..4ad9f413ca0 100644
--- a/compiler-rt/test/tsan/blacklist2.cc
+++ b/compiler-rt/test/tsan/blacklist2.cpp
@@ -13,25 +13,25 @@ void *Thread1(void *x) {
   barrier_wait(&barrier);
   // CHECK: ThreadSanitizer: data race
   // CHECK: Write of size 4
-  // CHECK: #0 Thread1{{.*}}blacklist2.cc:[[@LINE+1]]
+  // CHECK: #0 Thread1{{.*}}blacklist2.cpp:[[@LINE+1]]
   Global++;
   return NULL;
 }
 
 void TouchGlobal() {
   // CHECK: Previous write of size 4
-  // CHECK: #0 TouchGlobal{{.*}}blacklist2.cc:[[@LINE+1]]
+  // CHECK: #0 TouchGlobal{{.*}}blacklist2.cpp:[[@LINE+1]]
   Global--;
 }
 
 void CallTouchGlobal() {
-  // CHECK: #1 CallTouchGlobal{{.*}}blacklist2.cc:[[@LINE+1]]
+  // CHECK: #1 CallTouchGlobal{{.*}}blacklist2.cpp:[[@LINE+1]]
   TouchGlobal();
 }
 
 void *Blacklisted_Thread2(void *x) {
   Global--;
-  // CHECK: #2 Blacklisted_Thread2{{.*}}blacklist2.cc:[[@LINE+1]]
+  // CHECK: #2 Blacklisted_Thread2{{.*}}blacklist2.cpp:[[@LINE+1]]
   CallTouchGlobal();
   barrier_wait(&barrier);
   return NULL;
diff --git a/compiler-rt/test/tsan/cond_destruction.cc b/compiler-rt/test/tsan/cond_destruction.cpp
index f56b30c4f0a..f56b30c4f0a 100644
--- a/compiler-rt/test/tsan/cond_destruction.cc
+++ b/compiler-rt/test/tsan/cond_destruction.cpp
diff --git a/compiler-rt/test/tsan/cond_race.cc b/compiler-rt/test/tsan/cond_race.cpp
index 4daf37f8541..4daf37f8541 100644
--- a/compiler-rt/test/tsan/cond_race.cc
+++ b/compiler-rt/test/tsan/cond_race.cpp
diff --git a/compiler-rt/test/tsan/custom_mutex0.cc b/compiler-rt/test/tsan/custom_mutex0.cpp
index 8302fd8841a..8302fd8841a 100644
--- a/compiler-rt/test/tsan/custom_mutex0.cc
+++ b/compiler-rt/test/tsan/custom_mutex0.cpp
diff --git a/compiler-rt/test/tsan/custom_mutex1.cc b/compiler-rt/test/tsan/custom_mutex1.cpp
index 1c879f502f6..c9324e5640b 100644
--- a/compiler-rt/test/tsan/custom_mutex1.cc
+++ b/compiler-rt/test/tsan/custom_mutex1.cpp
@@ -35,5 +35,5 @@ int main() {
 
 // CHECK: ThreadSanitizer: data race
 // CHECK-NEXT:   Write of size 8 at {{.*}} by main thread:
-// CHECK-NEXT:     #0 main {{.*}}custom_mutex1.cc:29
+// CHECK-NEXT:     #0 main {{.*}}custom_mutex1.cpp:29
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/custom_mutex2.cc b/compiler-rt/test/tsan/custom_mutex2.cpp
index d4aca7e038c..d4aca7e038c 100644
--- a/compiler-rt/test/tsan/custom_mutex2.cc
+++ b/compiler-rt/test/tsan/custom_mutex2.cpp
diff --git a/compiler-rt/test/tsan/custom_mutex3.cc b/compiler-rt/test/tsan/custom_mutex3.cpp
index 6e99926adbc..6e99926adbc 100644
--- a/compiler-rt/test/tsan/custom_mutex3.cc
+++ b/compiler-rt/test/tsan/custom_mutex3.cpp
diff --git a/compiler-rt/test/tsan/custom_mutex4.cc b/compiler-rt/test/tsan/custom_mutex4.cpp
index 539a8be803c..539a8be803c 100644
--- a/compiler-rt/test/tsan/custom_mutex4.cc
+++ b/compiler-rt/test/tsan/custom_mutex4.cpp
diff --git a/compiler-rt/test/tsan/custom_mutex5.cc b/compiler-rt/test/tsan/custom_mutex5.cpp
index ad906e38aeb..cb18b235e26 100644
--- a/compiler-rt/test/tsan/custom_mutex5.cc
+++ b/compiler-rt/test/tsan/custom_mutex5.cpp
@@ -27,7 +27,7 @@ int main() {
 }
 
 // CHECK: WARNING: ThreadSanitizer: destroy of a locked mutex
-// CHECK:   main {{.*}}custom_mutex5.cc:14
+// CHECK:   main {{.*}}custom_mutex5.cpp:14
 // CHECK: WARNING: ThreadSanitizer: destroy of a locked mutex
-// CHECK:   main {{.*}}custom_mutex5.cc:22
+// CHECK:   main {{.*}}custom_mutex5.cpp:22
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/cxa_guard_acquire.cc b/compiler-rt/test/tsan/cxa_guard_acquire.cpp
index cdbe609003d..cdbe609003d 100644
--- a/compiler-rt/test/tsan/cxa_guard_acquire.cc
+++ b/compiler-rt/test/tsan/cxa_guard_acquire.cpp
diff --git a/compiler-rt/test/tsan/deadlock_detector_stress_test.cc b/compiler-rt/test/tsan/deadlock_detector_stress_test.cpp
index f3d2fc71249..f3d2fc71249 100644
--- a/compiler-rt/test/tsan/deadlock_detector_stress_test.cc
+++ b/compiler-rt/test/tsan/deadlock_detector_stress_test.cpp
diff --git a/compiler-rt/test/tsan/debug_alloc_stack.cc b/compiler-rt/test/tsan/debug_alloc_stack.cpp
index ffe99e73a2a..ffe99e73a2a 100644
--- a/compiler-rt/test/tsan/debug_alloc_stack.cc
+++ b/compiler-rt/test/tsan/debug_alloc_stack.cpp
diff --git a/compiler-rt/test/tsan/debug_locate.cc b/compiler-rt/test/tsan/debug_locate.cpp
index 01b0960d85b..01b0960d85b 100644
--- a/compiler-rt/test/tsan/debug_locate.cc
+++ b/compiler-rt/test/tsan/debug_locate.cpp
diff --git a/compiler-rt/test/tsan/debugging.cc b/compiler-rt/test/tsan/debugging.cpp
index d9c7c65816a..d9c7c65816a 100644
--- a/compiler-rt/test/tsan/debugging.cc
+++ b/compiler-rt/test/tsan/debugging.cpp
diff --git a/compiler-rt/test/tsan/deep_stack1.cc b/compiler-rt/test/tsan/deep_stack1.cpp
index 44dd0c44392..44dd0c44392 100644
--- a/compiler-rt/test/tsan/deep_stack1.cc
+++ b/compiler-rt/test/tsan/deep_stack1.cpp
diff --git a/compiler-rt/test/tsan/default_options.cc b/compiler-rt/test/tsan/default_options.cpp
index 77bdcd5086b..77bdcd5086b 100644
--- a/compiler-rt/test/tsan/default_options.cc
+++ b/compiler-rt/test/tsan/default_options.cpp
diff --git a/compiler-rt/test/tsan/dl_iterate_phdr.cc b/compiler-rt/test/tsan/dl_iterate_phdr.cpp
index 4a1fcc21c9c..4a1fcc21c9c 100644
--- a/compiler-rt/test/tsan/dl_iterate_phdr.cc
+++ b/compiler-rt/test/tsan/dl_iterate_phdr.cpp
diff --git a/compiler-rt/test/tsan/dlclose.cc b/compiler-rt/test/tsan/dlclose.cpp
index 6f0716d80c3..6f0716d80c3 100644
--- a/compiler-rt/test/tsan/dlclose.cc
+++ b/compiler-rt/test/tsan/dlclose.cpp
diff --git a/compiler-rt/test/tsan/exceptions.cc b/compiler-rt/test/tsan/exceptions.cpp
index 193e115f780..193e115f780 100644
--- a/compiler-rt/test/tsan/exceptions.cc
+++ b/compiler-rt/test/tsan/exceptions.cpp
diff --git a/compiler-rt/test/tsan/fd_close_norace.cc b/compiler-rt/test/tsan/fd_close_norace.cpp
index 7d9d491f1dc..7d9d491f1dc 100644
--- a/compiler-rt/test/tsan/fd_close_norace.cc
+++ b/compiler-rt/test/tsan/fd_close_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_close_norace2.cc b/compiler-rt/test/tsan/fd_close_norace2.cpp
index 382ae5f34a8..382ae5f34a8 100644
--- a/compiler-rt/test/tsan/fd_close_norace2.cc
+++ b/compiler-rt/test/tsan/fd_close_norace2.cpp
diff --git a/compiler-rt/test/tsan/fd_dup_norace.cc b/compiler-rt/test/tsan/fd_dup_norace.cpp
index e5995175bc0..e5995175bc0 100644
--- a/compiler-rt/test/tsan/fd_dup_norace.cc
+++ b/compiler-rt/test/tsan/fd_dup_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_dup_norace2.cc b/compiler-rt/test/tsan/fd_dup_norace2.cpp
index 31aaed9d356..31aaed9d356 100644
--- a/compiler-rt/test/tsan/fd_dup_norace2.cc
+++ b/compiler-rt/test/tsan/fd_dup_norace2.cpp
diff --git a/compiler-rt/test/tsan/fd_dup_race.cc b/compiler-rt/test/tsan/fd_dup_race.cpp
index d665eebff98..d665eebff98 100644
--- a/compiler-rt/test/tsan/fd_dup_race.cc
+++ b/compiler-rt/test/tsan/fd_dup_race.cpp
diff --git a/compiler-rt/test/tsan/fd_location.cc b/compiler-rt/test/tsan/fd_location.cpp
index 1861c89cba9..1861c89cba9 100644
--- a/compiler-rt/test/tsan/fd_location.cc
+++ b/compiler-rt/test/tsan/fd_location.cpp
diff --git a/compiler-rt/test/tsan/fd_pipe_norace.cc b/compiler-rt/test/tsan/fd_pipe_norace.cpp
index 01c4490c6c8..01c4490c6c8 100644
--- a/compiler-rt/test/tsan/fd_pipe_norace.cc
+++ b/compiler-rt/test/tsan/fd_pipe_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_pipe_race.cc b/compiler-rt/test/tsan/fd_pipe_race.cpp
index b94893b9369..b94893b9369 100644
--- a/compiler-rt/test/tsan/fd_pipe_race.cc
+++ b/compiler-rt/test/tsan/fd_pipe_race.cpp
diff --git a/compiler-rt/test/tsan/fd_socket_connect_norace.cc b/compiler-rt/test/tsan/fd_socket_connect_norace.cpp
index 12375189a0f..12375189a0f 100644
--- a/compiler-rt/test/tsan/fd_socket_connect_norace.cc
+++ b/compiler-rt/test/tsan/fd_socket_connect_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_socket_norace.cc b/compiler-rt/test/tsan/fd_socket_norace.cpp
index a1761cb27fd..a1761cb27fd 100644
--- a/compiler-rt/test/tsan/fd_socket_norace.cc
+++ b/compiler-rt/test/tsan/fd_socket_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_socketpair_norace.cc b/compiler-rt/test/tsan/fd_socketpair_norace.cpp
index bee030dd324..bee030dd324 100644
--- a/compiler-rt/test/tsan/fd_socketpair_norace.cc
+++ b/compiler-rt/test/tsan/fd_socketpair_norace.cpp
diff --git a/compiler-rt/test/tsan/fd_stdout_race.cc b/compiler-rt/test/tsan/fd_stdout_race.cpp
index fcf8c21300c..fcf8c21300c 100644
--- a/compiler-rt/test/tsan/fd_stdout_race.cc
+++ b/compiler-rt/test/tsan/fd_stdout_race.cpp
diff --git a/compiler-rt/test/tsan/fd_tid_recycled.cc b/compiler-rt/test/tsan/fd_tid_recycled.cpp
index d31478728bc..d31478728bc 100644
--- a/compiler-rt/test/tsan/fd_tid_recycled.cc
+++ b/compiler-rt/test/tsan/fd_tid_recycled.cpp
diff --git a/compiler-rt/test/tsan/fiber_asm.cc b/compiler-rt/test/tsan/fiber_asm.cpp
index 63b63d38265..63b63d38265 100644
--- a/compiler-rt/test/tsan/fiber_asm.cc
+++ b/compiler-rt/test/tsan/fiber_asm.cpp
diff --git a/compiler-rt/test/tsan/fiber_from_thread.cc b/compiler-rt/test/tsan/fiber_from_thread.cpp
index d27379e7acf..d27379e7acf 100644
--- a/compiler-rt/test/tsan/fiber_from_thread.cc
+++ b/compiler-rt/test/tsan/fiber_from_thread.cpp
diff --git a/compiler-rt/test/tsan/fiber_longjmp.cc b/compiler-rt/test/tsan/fiber_longjmp.cpp
index e56fd21befb..e56fd21befb 100644
--- a/compiler-rt/test/tsan/fiber_longjmp.cc
+++ b/compiler-rt/test/tsan/fiber_longjmp.cpp
diff --git a/compiler-rt/test/tsan/fiber_race.cc b/compiler-rt/test/tsan/fiber_race.cpp
index add66940ffd..add66940ffd 100644
--- a/compiler-rt/test/tsan/fiber_race.cc
+++ b/compiler-rt/test/tsan/fiber_race.cpp
diff --git a/compiler-rt/test/tsan/fiber_simple.cc b/compiler-rt/test/tsan/fiber_simple.cpp
index 8123eb8eafc..8123eb8eafc 100644
--- a/compiler-rt/test/tsan/fiber_simple.cc
+++ b/compiler-rt/test/tsan/fiber_simple.cpp
diff --git a/compiler-rt/test/tsan/fiber_two_threads.cc b/compiler-rt/test/tsan/fiber_two_threads.cpp
index d2961b94dde..d2961b94dde 100644
--- a/compiler-rt/test/tsan/fiber_two_threads.cc
+++ b/compiler-rt/test/tsan/fiber_two_threads.cpp
diff --git a/compiler-rt/test/tsan/fork_atexit.cc b/compiler-rt/test/tsan/fork_atexit.cpp
index 6e3a2f5c4ba..6e3a2f5c4ba 100644
--- a/compiler-rt/test/tsan/fork_atexit.cc
+++ b/compiler-rt/test/tsan/fork_atexit.cpp
diff --git a/compiler-rt/test/tsan/fork_deadlock.cc b/compiler-rt/test/tsan/fork_deadlock.cpp
index 32006e2ae53..32006e2ae53 100644
--- a/compiler-rt/test/tsan/fork_deadlock.cc
+++ b/compiler-rt/test/tsan/fork_deadlock.cpp
diff --git a/compiler-rt/test/tsan/fork_multithreaded.cc b/compiler-rt/test/tsan/fork_multithreaded.cpp
index faf407b9565..faf407b9565 100644
--- a/compiler-rt/test/tsan/fork_multithreaded.cc
+++ b/compiler-rt/test/tsan/fork_multithreaded.cpp
diff --git a/compiler-rt/test/tsan/fork_multithreaded3.cc b/compiler-rt/test/tsan/fork_multithreaded3.cpp
index a651b3c18b4..a651b3c18b4 100644
--- a/compiler-rt/test/tsan/fork_multithreaded3.cc
+++ b/compiler-rt/test/tsan/fork_multithreaded3.cpp
diff --git a/compiler-rt/test/tsan/getline_nohang.cc b/compiler-rt/test/tsan/getline_nohang.cpp
index 027ba7bac26..027ba7bac26 100644
--- a/compiler-rt/test/tsan/getline_nohang.cc
+++ b/compiler-rt/test/tsan/getline_nohang.cpp
diff --git a/compiler-rt/test/tsan/global_race.cc b/compiler-rt/test/tsan/global_race.cpp
index 01df3b6de9c..66959827bb4 100644
--- a/compiler-rt/test/tsan/global_race.cc
+++ b/compiler-rt/test/tsan/global_race.cpp
@@ -1,15 +1,15 @@
 // RUN: rm -rf %t-dir
 // RUN: mkdir %t-dir
 
-// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cc.exe && %deflake %run %t-dir/global_race.cc.exe 2>&1 \
+// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cpp.exe && %deflake %run %t-dir/global_race.cpp.exe 2>&1 \
 // RUN:   | FileCheck %s
 
 // Also check that memory access instrumentation can be configured by either
 // driver or legacy flags:
 
-// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cc.exe -fno-sanitize-thread-memory-access && not %deflake %run %t-dir/global_race.cc.exe 2>&1 \
+// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cpp.exe -fno-sanitize-thread-memory-access && not %deflake %run %t-dir/global_race.cpp.exe 2>&1 \
 // RUN:   | FileCheck --allow-empty --check-prefix=CHECK-MEMORY-ACCESS-OFF %s
-// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cc.exe -mllvm -tsan-instrument-memory-accesses=0 && not %deflake %run %t-dir/global_race.cc.exe 2>&1 \
+// RUN: %clangxx_tsan -O1 %s -o %t-dir/global_race.cpp.exe -mllvm -tsan-instrument-memory-accesses=0 && not %deflake %run %t-dir/global_race.cpp.exe 2>&1 \
 // RUN:   | FileCheck --allow-empty --check-prefix=CHECK-MEMORY-ACCESS-OFF %s
 
 #include "test.h"
@@ -34,6 +34,6 @@ int main() {
 
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK: Location is global 'GlobalData' {{(of size 40 )?}}at [[ADDR]] (global_race.cc.exe+0x{{[0-9,a-f]+}})
+// CHECK: Location is global 'GlobalData' {{(of size 40 )?}}at [[ADDR]] (global_race.cpp.exe+0x{{[0-9,a-f]+}})
 
 // CHECK-MEMORY-ACCESS-OFF-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/test/tsan/global_race2.cc b/compiler-rt/test/tsan/global_race2.cpp
index 95dff199780..95dff199780 100644
--- a/compiler-rt/test/tsan/global_race2.cc
+++ b/compiler-rt/test/tsan/global_race2.cpp
diff --git a/compiler-rt/test/tsan/global_race3.cc b/compiler-rt/test/tsan/global_race3.cpp
index e0d59d28442..e0d59d28442 100644
--- a/compiler-rt/test/tsan/global_race3.cc
+++ b/compiler-rt/test/tsan/global_race3.cpp
diff --git a/compiler-rt/test/tsan/halt_on_error.cc b/compiler-rt/test/tsan/halt_on_error.cpp
index 5d481c3cbcd..5d481c3cbcd 100644
--- a/compiler-rt/test/tsan/halt_on_error.cc
+++ b/compiler-rt/test/tsan/halt_on_error.cpp
diff --git a/compiler-rt/test/tsan/heap_race.cc b/compiler-rt/test/tsan/heap_race.cpp
index 0201ea9a2e7..0201ea9a2e7 100644
--- a/compiler-rt/test/tsan/heap_race.cc
+++ b/compiler-rt/test/tsan/heap_race.cpp
diff --git a/compiler-rt/test/tsan/ignore_free.cc b/compiler-rt/test/tsan/ignore_free.cpp
index 4e678952c7a..4e678952c7a 100644
--- a/compiler-rt/test/tsan/ignore_free.cc
+++ b/compiler-rt/test/tsan/ignore_free.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib0.cc b/compiler-rt/test/tsan/ignore_lib0.cpp
index 1d375336b1c..1d375336b1c 100644
--- a/compiler-rt/test/tsan/ignore_lib0.cc
+++ b/compiler-rt/test/tsan/ignore_lib0.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib0.cc.supp b/compiler-rt/test/tsan/ignore_lib0.cpp.supp
index 7728c926b7d..7728c926b7d 100644
--- a/compiler-rt/test/tsan/ignore_lib0.cc.supp
+++ b/compiler-rt/test/tsan/ignore_lib0.cpp.supp
diff --git a/compiler-rt/test/tsan/ignore_lib1.cc b/compiler-rt/test/tsan/ignore_lib1.cpp
index 2a708eaab40..2a708eaab40 100644
--- a/compiler-rt/test/tsan/ignore_lib1.cc
+++ b/compiler-rt/test/tsan/ignore_lib1.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib1.cc.supp b/compiler-rt/test/tsan/ignore_lib1.cpp.supp
index 9f4119ec0bc..9f4119ec0bc 100644
--- a/compiler-rt/test/tsan/ignore_lib1.cc.supp
+++ b/compiler-rt/test/tsan/ignore_lib1.cpp.supp
diff --git a/compiler-rt/test/tsan/ignore_lib2.cc b/compiler-rt/test/tsan/ignore_lib2.cpp
index 05b7c2ed915..05b7c2ed915 100644
--- a/compiler-rt/test/tsan/ignore_lib2.cc
+++ b/compiler-rt/test/tsan/ignore_lib2.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib2.cc.supp b/compiler-rt/test/tsan/ignore_lib2.cpp.supp
index 1419c71c67e..1419c71c67e 100644
--- a/compiler-rt/test/tsan/ignore_lib2.cc.supp
+++ b/compiler-rt/test/tsan/ignore_lib2.cpp.supp
diff --git a/compiler-rt/test/tsan/ignore_lib3.cc b/compiler-rt/test/tsan/ignore_lib3.cpp
index b1a3940d03b..b1a3940d03b 100644
--- a/compiler-rt/test/tsan/ignore_lib3.cc
+++ b/compiler-rt/test/tsan/ignore_lib3.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib3.cc.supp b/compiler-rt/test/tsan/ignore_lib3.cpp.supp
index 975dbcef99f..975dbcef99f 100644
--- a/compiler-rt/test/tsan/ignore_lib3.cc.supp
+++ b/compiler-rt/test/tsan/ignore_lib3.cpp.supp
diff --git a/compiler-rt/test/tsan/ignore_lib4.cc b/compiler-rt/test/tsan/ignore_lib4.cpp
index 06241c7b89f..06241c7b89f 100644
--- a/compiler-rt/test/tsan/ignore_lib4.cc
+++ b/compiler-rt/test/tsan/ignore_lib4.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib5.cc b/compiler-rt/test/tsan/ignore_lib5.cpp
index 81a1840c955..81a1840c955 100644
--- a/compiler-rt/test/tsan/ignore_lib5.cc
+++ b/compiler-rt/test/tsan/ignore_lib5.cpp
diff --git a/compiler-rt/test/tsan/ignore_lib5.cc.supp b/compiler-rt/test/tsan/ignore_lib5.cpp.supp
index 9f4119ec0bc..9f4119ec0bc 100644
--- a/compiler-rt/test/tsan/ignore_lib5.cc.supp
+++ b/compiler-rt/test/tsan/ignore_lib5.cpp.supp
diff --git a/compiler-rt/test/tsan/ignore_malloc.cc b/compiler-rt/test/tsan/ignore_malloc.cpp
index 100b4e5dc80..100b4e5dc80 100644
--- a/compiler-rt/test/tsan/ignore_malloc.cc
+++ b/compiler-rt/test/tsan/ignore_malloc.cpp
diff --git a/compiler-rt/test/tsan/ignore_race.cc b/compiler-rt/test/tsan/ignore_race.cpp
index e410006ddc7..e410006ddc7 100644
--- a/compiler-rt/test/tsan/ignore_race.cc
+++ b/compiler-rt/test/tsan/ignore_race.cpp
diff --git a/compiler-rt/test/tsan/ignore_sync.cc b/compiler-rt/test/tsan/ignore_sync.cpp
index ae24a8c49e7..ae24a8c49e7 100644
--- a/compiler-rt/test/tsan/ignore_sync.cc
+++ b/compiler-rt/test/tsan/ignore_sync.cpp
diff --git a/compiler-rt/test/tsan/ignored-interceptors-mmap.cc b/compiler-rt/test/tsan/ignored-interceptors-mmap.cpp
index bb43250a659..bb43250a659 100644
--- a/compiler-rt/test/tsan/ignored-interceptors-mmap.cc
+++ b/compiler-rt/test/tsan/ignored-interceptors-mmap.cpp
diff --git a/compiler-rt/test/tsan/inlined_memcpy_race.cc b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
index 4d085893aae..4d085893aae 100644
--- a/compiler-rt/test/tsan/inlined_memcpy_race.cc
+++ b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
diff --git a/compiler-rt/test/tsan/inlined_memcpy_race2.cc b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
index 906a52bd32e..906a52bd32e 100644
--- a/compiler-rt/test/tsan/inlined_memcpy_race2.cc
+++ b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
diff --git a/compiler-rt/test/tsan/java_alloc.cc b/compiler-rt/test/tsan/java_alloc.cpp
index 94919a4373a..94919a4373a 100644
--- a/compiler-rt/test/tsan/java_alloc.cc
+++ b/compiler-rt/test/tsan/java_alloc.cpp
diff --git a/compiler-rt/test/tsan/java_finalizer.cc b/compiler-rt/test/tsan/java_finalizer.cpp
index acbbf08ad71..acbbf08ad71 100644
--- a/compiler-rt/test/tsan/java_finalizer.cc
+++ b/compiler-rt/test/tsan/java_finalizer.cpp
diff --git a/compiler-rt/test/tsan/java_find.cc b/compiler-rt/test/tsan/java_find.cpp
index 078aac52021..078aac52021 100644
--- a/compiler-rt/test/tsan/java_find.cc
+++ b/compiler-rt/test/tsan/java_find.cpp
diff --git a/compiler-rt/test/tsan/java_heap_init.cc b/compiler-rt/test/tsan/java_heap_init.cpp
index 47ec5dbad28..47ec5dbad28 100644
--- a/compiler-rt/test/tsan/java_heap_init.cc
+++ b/compiler-rt/test/tsan/java_heap_init.cpp
diff --git a/compiler-rt/test/tsan/java_lock.cc b/compiler-rt/test/tsan/java_lock.cpp
index f1720529523..f1720529523 100644
--- a/compiler-rt/test/tsan/java_lock.cc
+++ b/compiler-rt/test/tsan/java_lock.cpp
diff --git a/compiler-rt/test/tsan/java_lock_move.cc b/compiler-rt/test/tsan/java_lock_move.cpp
index 66599f8b708..66599f8b708 100644
--- a/compiler-rt/test/tsan/java_lock_move.cc
+++ b/compiler-rt/test/tsan/java_lock_move.cpp
diff --git a/compiler-rt/test/tsan/java_lock_rec.cc b/compiler-rt/test/tsan/java_lock_rec.cpp
index aa8de97a148..aa8de97a148 100644
--- a/compiler-rt/test/tsan/java_lock_rec.cc
+++ b/compiler-rt/test/tsan/java_lock_rec.cpp
diff --git a/compiler-rt/test/tsan/java_lock_rec_race.cc b/compiler-rt/test/tsan/java_lock_rec_race.cpp
index bf56eef2022..bf56eef2022 100644
--- a/compiler-rt/test/tsan/java_lock_rec_race.cc
+++ b/compiler-rt/test/tsan/java_lock_rec_race.cpp
diff --git a/compiler-rt/test/tsan/java_move_overlap.cc b/compiler-rt/test/tsan/java_move_overlap.cpp
index bf8d1e1550f..bf8d1e1550f 100644
--- a/compiler-rt/test/tsan/java_move_overlap.cc
+++ b/compiler-rt/test/tsan/java_move_overlap.cpp
diff --git a/compiler-rt/test/tsan/java_move_overlap_race.cc b/compiler-rt/test/tsan/java_move_overlap_race.cpp
index fbbcf2c8a33..fbbcf2c8a33 100644
--- a/compiler-rt/test/tsan/java_move_overlap_race.cc
+++ b/compiler-rt/test/tsan/java_move_overlap_race.cpp
diff --git a/compiler-rt/test/tsan/java_race.cc b/compiler-rt/test/tsan/java_race.cpp
index 140a2a3c19d..140a2a3c19d 100644
--- a/compiler-rt/test/tsan/java_race.cc
+++ b/compiler-rt/test/tsan/java_race.cpp
diff --git a/compiler-rt/test/tsan/java_race_move.cc b/compiler-rt/test/tsan/java_race_move.cpp
index 6d1b092160e..6d1b092160e 100644
--- a/compiler-rt/test/tsan/java_race_move.cc
+++ b/compiler-rt/test/tsan/java_race_move.cpp
diff --git a/compiler-rt/test/tsan/java_race_pc.cc b/compiler-rt/test/tsan/java_race_pc.cpp
index be1c5f26a3b..be1c5f26a3b 100644
--- a/compiler-rt/test/tsan/java_race_pc.cc
+++ b/compiler-rt/test/tsan/java_race_pc.cpp
diff --git a/compiler-rt/test/tsan/java_rwlock.cc b/compiler-rt/test/tsan/java_rwlock.cpp
index aa77273a41b..aa77273a41b 100644
--- a/compiler-rt/test/tsan/java_rwlock.cc
+++ b/compiler-rt/test/tsan/java_rwlock.cpp
diff --git a/compiler-rt/test/tsan/java_symbolization.cc b/compiler-rt/test/tsan/java_symbolization.cpp
index f82bd5ead48..f82bd5ead48 100644
--- a/compiler-rt/test/tsan/java_symbolization.cc
+++ b/compiler-rt/test/tsan/java_symbolization.cpp
diff --git a/compiler-rt/test/tsan/java_symbolization_legacy.cc b/compiler-rt/test/tsan/java_symbolization_legacy.cpp
index aa5ec0c3755..aa5ec0c3755 100644
--- a/compiler-rt/test/tsan/java_symbolization_legacy.cc
+++ b/compiler-rt/test/tsan/java_symbolization_legacy.cpp
diff --git a/compiler-rt/test/tsan/java_volatile.cc b/compiler-rt/test/tsan/java_volatile.cpp
index 885b4f24171..885b4f24171 100644
--- a/compiler-rt/test/tsan/java_volatile.cc
+++ b/compiler-rt/test/tsan/java_volatile.cpp
diff --git a/compiler-rt/test/tsan/large_malloc_meta.cc b/compiler-rt/test/tsan/large_malloc_meta.cpp
index 0d0eec34b38..0d0eec34b38 100644
--- a/compiler-rt/test/tsan/large_malloc_meta.cc
+++ b/compiler-rt/test/tsan/large_malloc_meta.cpp
diff --git a/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc b/compiler-rt/test/tsan/libcxx/std_shared_ptr.cpp
index e8e168a682f..e8e168a682f 100644
--- a/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc
+++ b/compiler-rt/test/tsan/libcxx/std_shared_ptr.cpp
diff --git a/compiler-rt/test/tsan/libdispatch/groups-destructor.cc b/compiler-rt/test/tsan/libdispatch/groups-destructor.cpp
index 72338ce6c5c..72338ce6c5c 100644
--- a/compiler-rt/test/tsan/libdispatch/groups-destructor.cc
+++ b/compiler-rt/test/tsan/libdispatch/groups-destructor.cpp
diff --git a/compiler-rt/test/tsan/libdispatch/sync-block-copy.cc b/compiler-rt/test/tsan/libdispatch/sync-block-copy.cpp
index 1f10d958be2..1f10d958be2 100644
--- a/compiler-rt/test/tsan/libdispatch/sync-block-copy.cc
+++ b/compiler-rt/test/tsan/libdispatch/sync-block-copy.cpp
diff --git a/compiler-rt/test/tsan/load_shared_lib.cc b/compiler-rt/test/tsan/load_shared_lib.cpp
index a8939be4cee..a8939be4cee 100644
--- a/compiler-rt/test/tsan/load_shared_lib.cc
+++ b/compiler-rt/test/tsan/load_shared_lib.cpp
diff --git a/compiler-rt/test/tsan/longjmp.cc b/compiler-rt/test/tsan/longjmp.cpp
index a8abca60175..a8abca60175 100644
--- a/compiler-rt/test/tsan/longjmp.cc
+++ b/compiler-rt/test/tsan/longjmp.cpp
diff --git a/compiler-rt/test/tsan/longjmp2.cc b/compiler-rt/test/tsan/longjmp2.cpp
index d396f3fec66..d396f3fec66 100644
--- a/compiler-rt/test/tsan/longjmp2.cc
+++ b/compiler-rt/test/tsan/longjmp2.cpp
diff --git a/compiler-rt/test/tsan/longjmp3.cc b/compiler-rt/test/tsan/longjmp3.cpp
index 842cf264c97..842cf264c97 100644
--- a/compiler-rt/test/tsan/longjmp3.cc
+++ b/compiler-rt/test/tsan/longjmp3.cpp
diff --git a/compiler-rt/test/tsan/longjmp4.cc b/compiler-rt/test/tsan/longjmp4.cpp
index 4c2fbf0c402..4c2fbf0c402 100644
--- a/compiler-rt/test/tsan/longjmp4.cc
+++ b/compiler-rt/test/tsan/longjmp4.cpp
diff --git a/compiler-rt/test/tsan/malloc_overflow.cc b/compiler-rt/test/tsan/malloc_overflow.cpp
index 3db412978d0..3db412978d0 100644
--- a/compiler-rt/test/tsan/malloc_overflow.cc
+++ b/compiler-rt/test/tsan/malloc_overflow.cpp
diff --git a/compiler-rt/test/tsan/malloc_stack.cc b/compiler-rt/test/tsan/malloc_stack.cpp
index f0c6f9354a5..f0c6f9354a5 100644
--- a/compiler-rt/test/tsan/malloc_stack.cc
+++ b/compiler-rt/test/tsan/malloc_stack.cpp
diff --git a/compiler-rt/test/tsan/map32bit.cc b/compiler-rt/test/tsan/map32bit.cpp
index 8aef27bc190..8aef27bc190 100644
--- a/compiler-rt/test/tsan/map32bit.cc
+++ b/compiler-rt/test/tsan/map32bit.cpp
diff --git a/compiler-rt/test/tsan/memcmp_race.cc b/compiler-rt/test/tsan/memcmp_race.cpp
index b76f427e121..b76f427e121 100644
--- a/compiler-rt/test/tsan/memcmp_race.cc
+++ b/compiler-rt/test/tsan/memcmp_race.cpp
diff --git a/compiler-rt/test/tsan/memcpy_race.cc b/compiler-rt/test/tsan/memcpy_race.cpp
index 4a098c0405f..4a098c0405f 100644
--- a/compiler-rt/test/tsan/memcpy_race.cc
+++ b/compiler-rt/test/tsan/memcpy_race.cpp
diff --git a/compiler-rt/test/tsan/mmap_large.cc b/compiler-rt/test/tsan/mmap_large.cpp
index c8d258e804d..c8d258e804d 100644
--- a/compiler-rt/test/tsan/mmap_large.cc
+++ b/compiler-rt/test/tsan/mmap_large.cpp
diff --git a/compiler-rt/test/tsan/mmap_stress.cc b/compiler-rt/test/tsan/mmap_stress.cpp
index f272779a49b..f272779a49b 100644
--- a/compiler-rt/test/tsan/mmap_stress.cc
+++ b/compiler-rt/test/tsan/mmap_stress.cpp
diff --git a/compiler-rt/test/tsan/mop_with_offset.cc b/compiler-rt/test/tsan/mop_with_offset.cpp
index e2496d099ef..e2496d099ef 100644
--- a/compiler-rt/test/tsan/mop_with_offset.cc
+++ b/compiler-rt/test/tsan/mop_with_offset.cpp
diff --git a/compiler-rt/test/tsan/mop_with_offset2.cc b/compiler-rt/test/tsan/mop_with_offset2.cpp
index 73c53f51233..73c53f51233 100644
--- a/compiler-rt/test/tsan/mop_with_offset2.cc
+++ b/compiler-rt/test/tsan/mop_with_offset2.cpp
diff --git a/compiler-rt/test/tsan/must_deadlock.cc b/compiler-rt/test/tsan/must_deadlock.cpp
index 1409800e9b3..1409800e9b3 100644
--- a/compiler-rt/test/tsan/must_deadlock.cc
+++ b/compiler-rt/test/tsan/must_deadlock.cpp
diff --git a/compiler-rt/test/tsan/mutex_annotations.cc b/compiler-rt/test/tsan/mutex_annotations.cpp
index 59fa452c0a7..59fa452c0a7 100644
--- a/compiler-rt/test/tsan/mutex_annotations.cc
+++ b/compiler-rt/test/tsan/mutex_annotations.cpp
diff --git a/compiler-rt/test/tsan/mutex_bad_read_lock.cc b/compiler-rt/test/tsan/mutex_bad_read_lock.cpp
index 84a2976d53e..84a2976d53e 100644
--- a/compiler-rt/test/tsan/mutex_bad_read_lock.cc
+++ b/compiler-rt/test/tsan/mutex_bad_read_lock.cpp
diff --git a/compiler-rt/test/tsan/mutex_bad_read_unlock.cc b/compiler-rt/test/tsan/mutex_bad_read_unlock.cpp
index dcee51599d5..dcee51599d5 100644
--- a/compiler-rt/test/tsan/mutex_bad_read_unlock.cc
+++ b/compiler-rt/test/tsan/mutex_bad_read_unlock.cpp
diff --git a/compiler-rt/test/tsan/mutex_bad_unlock.cc b/compiler-rt/test/tsan/mutex_bad_unlock.cpp
index 6b483cf17ed..6b483cf17ed 100644
--- a/compiler-rt/test/tsan/mutex_bad_unlock.cc
+++ b/compiler-rt/test/tsan/mutex_bad_unlock.cpp
diff --git a/compiler-rt/test/tsan/mutex_destroy_locked.cc b/compiler-rt/test/tsan/mutex_destroy_locked.cpp
index b81905ec68f..b81905ec68f 100644
--- a/compiler-rt/test/tsan/mutex_destroy_locked.cc
+++ b/compiler-rt/test/tsan/mutex_destroy_locked.cpp
diff --git a/compiler-rt/test/tsan/mutex_destroy_locked2.cc b/compiler-rt/test/tsan/mutex_destroy_locked2.cpp
index e29c96138a8..e29c96138a8 100644
--- a/compiler-rt/test/tsan/mutex_destroy_locked2.cc
+++ b/compiler-rt/test/tsan/mutex_destroy_locked2.cpp
diff --git a/compiler-rt/test/tsan/mutex_double_lock.cc b/compiler-rt/test/tsan/mutex_double_lock.cpp
index c1bebf73706..cd1e87df481 100644
--- a/compiler-rt/test/tsan/mutex_double_lock.cc
+++ b/compiler-rt/test/tsan/mutex_double_lock.cpp
@@ -25,5 +25,5 @@ int main() {
 // CHECK:   Mutex {{.*}} created at:
 // CHECK:     #0 AnnotateRWLockAcquired
 // CHECK:     #1 main
-// CHECK: SUMMARY: ThreadSanitizer: double lock of a mutex {{.*}}mutex_double_lock.cc{{.*}}ThreadFunc
+// CHECK: SUMMARY: ThreadSanitizer: double lock of a mutex {{.*}}mutex_double_lock.cpp{{.*}}ThreadFunc
 
diff --git a/compiler-rt/test/tsan/mutex_lock_destroyed.cc b/compiler-rt/test/tsan/mutex_lock_destroyed.cpp
index 581d8cce296..892d4440054 100644
--- a/compiler-rt/test/tsan/mutex_lock_destroyed.cc
+++ b/compiler-rt/test/tsan/mutex_lock_destroyed.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
   pthread_mutex_lock(m);
   // CHECK: WARNING: ThreadSanitizer: use of an invalid mutex (e.g. uninitialized or destroyed)
   // CHECK:   #0 pthread_mutex_lock
-  // CHECK:   #1 main {{.*}}mutex_lock_destroyed.cc:[[@LINE-3]]
+  // CHECK:   #1 main {{.*}}mutex_lock_destroyed.cpp:[[@LINE-3]]
 
   return 0;
 }
diff --git a/compiler-rt/test/tsan/mutexset1.cc b/compiler-rt/test/tsan/mutexset1.cpp
index 8403b340174..4aeeeda3a2c 100644
--- a/compiler-rt/test/tsan/mutexset1.cc
+++ b/compiler-rt/test/tsan/mutexset1.cpp
@@ -26,7 +26,7 @@ int main() {
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset1.cc:[[@LINE+1]]
+  // CHECK:     #1 main {{.*}}mutexset1.cpp:[[@LINE+1]]
   pthread_mutex_init(&mtx, 0);
   pthread_t t[2];
   pthread_create(&t[0], NULL, Thread1, NULL);
diff --git a/compiler-rt/test/tsan/mutexset2.cc b/compiler-rt/test/tsan/mutexset2.cpp
index 5f7c0c41bb0..58a43c236d3 100644
--- a/compiler-rt/test/tsan/mutexset2.cc
+++ b/compiler-rt/test/tsan/mutexset2.cpp
@@ -26,7 +26,7 @@ int main() {
   // CHECK:                     (mutexes: write [[M1:M[0-9]+]]):
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset2.cc:[[@LINE+1]]
+  // CHECK:     #1 main {{.*}}mutexset2.cpp:[[@LINE+1]]
   pthread_mutex_init(&mtx, 0);
   pthread_t t[2];
   pthread_create(&t[0], NULL, Thread1, NULL);
diff --git a/compiler-rt/test/tsan/mutexset3.cc b/compiler-rt/test/tsan/mutexset3.cpp
index 24a9d9bf01c..6e5d9cce2aa 100644
--- a/compiler-rt/test/tsan/mutexset3.cc
+++ b/compiler-rt/test/tsan/mutexset3.cpp
@@ -29,10 +29,10 @@ int main() {
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset3.cc:[[@LINE+4]]
+  // CHECK:     #1 main {{.*}}mutexset3.cpp:[[@LINE+4]]
   // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset3.cc:[[@LINE+2]]
+  // CHECK:     #1 main {{.*}}mutexset3.cpp:[[@LINE+2]]
   pthread_mutex_init(&mtx1, 0);
   pthread_mutex_init(&mtx2, 0);
   pthread_t t[2];
diff --git a/compiler-rt/test/tsan/mutexset4.cc b/compiler-rt/test/tsan/mutexset4.cpp
index 5d8ea9e400d..417efbd0d3c 100644
--- a/compiler-rt/test/tsan/mutexset4.cc
+++ b/compiler-rt/test/tsan/mutexset4.cpp
@@ -29,10 +29,10 @@ int main() {
   // CHECK:                 (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset4.cc:[[@LINE+4]]
+  // CHECK:     #1 main {{.*}}mutexset4.cpp:[[@LINE+4]]
   // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset4.cc:[[@LINE+2]]
+  // CHECK:     #1 main {{.*}}mutexset4.cpp:[[@LINE+2]]
   pthread_mutex_init(&mtx1, 0);
   pthread_mutex_init(&mtx2, 0);
   pthread_t t[2];
diff --git a/compiler-rt/test/tsan/mutexset5.cc b/compiler-rt/test/tsan/mutexset5.cpp
index b5f4e779492..16da605e0c2 100644
--- a/compiler-rt/test/tsan/mutexset5.cc
+++ b/compiler-rt/test/tsan/mutexset5.cpp
@@ -30,10 +30,10 @@ int main() {
   // CHECK:                              (mutexes: write [[M2:M[0-9]+]]):
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset5.cc:[[@LINE+4]]
+  // CHECK:     #1 main {{.*}}mutexset5.cpp:[[@LINE+4]]
   // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset5.cc:[[@LINE+5]]
+  // CHECK:     #1 main {{.*}}mutexset5.cpp:[[@LINE+5]]
   pthread_mutex_init(&mtx1, 0);
   pthread_mutex_init(&mtx2, 0);
   pthread_t t[2];
diff --git a/compiler-rt/test/tsan/mutexset6.cc b/compiler-rt/test/tsan/mutexset6.cpp
index ca349aaeee7..89a59055bc8 100644
--- a/compiler-rt/test/tsan/mutexset6.cc
+++ b/compiler-rt/test/tsan/mutexset6.cpp
@@ -34,11 +34,11 @@ int main() {
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2
   // CHECK:               (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]):
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
-  // CHECK:     #1 main {{.*}}mutexset6.cc:[[@LINE+5]]
+  // CHECK:     #1 main {{.*}}mutexset6.cpp:[[@LINE+5]]
   // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
-  // CHECK:     #1 main {{.*}}mutexset6.cc:[[@LINE+4]]
+  // CHECK:     #1 main {{.*}}mutexset6.cpp:[[@LINE+4]]
   // CHECK:   Mutex [[M3]] (0x{{.*}}) created at:
-  // CHECK:     #1 main {{.*}}mutexset6.cc:[[@LINE+3]]
+  // CHECK:     #1 main {{.*}}mutexset6.cpp:[[@LINE+3]]
   pthread_mutex_init(&mtx1, 0);
   pthread_mutex_init(&mtx2, 0);
   pthread_rwlock_init(&mtx3, 0);
diff --git a/compiler-rt/test/tsan/mutexset7.cc b/compiler-rt/test/tsan/mutexset7.cpp
index d3a221d1b42..d3a221d1b42 100644
--- a/compiler-rt/test/tsan/mutexset7.cc
+++ b/compiler-rt/test/tsan/mutexset7.cpp
diff --git a/compiler-rt/test/tsan/mutexset8.cc b/compiler-rt/test/tsan/mutexset8.cpp
index 69854e2ffa0..e2fbfdbeafb 100644
--- a/compiler-rt/test/tsan/mutexset8.cc
+++ b/compiler-rt/test/tsan/mutexset8.cpp
@@ -26,7 +26,7 @@ int main() {
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
   // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
-  // CHECK:     #1 main {{.*}}mutexset8.cc
+  // CHECK:     #1 main {{.*}}mutexset8.cpp
   mtx = new pthread_mutex_t;
   pthread_mutex_init(mtx, 0);
   pthread_t t[2];
diff --git a/compiler-rt/test/tsan/pie_test.cc b/compiler-rt/test/tsan/pie_test.cpp
index 93d31daf5fd..93d31daf5fd 100644
--- a/compiler-rt/test/tsan/pie_test.cc
+++ b/compiler-rt/test/tsan/pie_test.cpp
diff --git a/compiler-rt/test/tsan/pthread_key.cc b/compiler-rt/test/tsan/pthread_key.cpp
index 798caa4aba8..798caa4aba8 100644
--- a/compiler-rt/test/tsan/pthread_key.cc
+++ b/compiler-rt/test/tsan/pthread_key.cpp
diff --git a/compiler-rt/test/tsan/race_on_fputs.cc b/compiler-rt/test/tsan/race_on_fputs.cpp
index 53042e3d36b..53042e3d36b 100644
--- a/compiler-rt/test/tsan/race_on_fputs.cc
+++ b/compiler-rt/test/tsan/race_on_fputs.cpp
diff --git a/compiler-rt/test/tsan/race_on_heap.cc b/compiler-rt/test/tsan/race_on_heap.cpp
index 83bf36fad5f..83bf36fad5f 100644
--- a/compiler-rt/test/tsan/race_on_heap.cc
+++ b/compiler-rt/test/tsan/race_on_heap.cpp
diff --git a/compiler-rt/test/tsan/race_on_puts.cc b/compiler-rt/test/tsan/race_on_puts.cpp
index f2541823bf0..f2541823bf0 100644
--- a/compiler-rt/test/tsan/race_on_puts.cc
+++ b/compiler-rt/test/tsan/race_on_puts.cpp
diff --git a/compiler-rt/test/tsan/race_on_read.cc b/compiler-rt/test/tsan/race_on_read.cpp
index d388bbacde5..d388bbacde5 100644
--- a/compiler-rt/test/tsan/race_on_read.cc
+++ b/compiler-rt/test/tsan/race_on_read.cpp
diff --git a/compiler-rt/test/tsan/race_on_speculative_load.cc b/compiler-rt/test/tsan/race_on_speculative_load.cpp
index 5a9d698ca9a..5a9d698ca9a 100644
--- a/compiler-rt/test/tsan/race_on_speculative_load.cc
+++ b/compiler-rt/test/tsan/race_on_speculative_load.cpp
diff --git a/compiler-rt/test/tsan/race_on_write.cc b/compiler-rt/test/tsan/race_on_write.cpp
index 147591a39b9..147591a39b9 100644
--- a/compiler-rt/test/tsan/race_on_write.cc
+++ b/compiler-rt/test/tsan/race_on_write.cpp
diff --git a/compiler-rt/test/tsan/race_stress.cc b/compiler-rt/test/tsan/race_stress.cpp
index 38acefce6e4..38acefce6e4 100644
--- a/compiler-rt/test/tsan/race_stress.cc
+++ b/compiler-rt/test/tsan/race_stress.cpp
diff --git a/compiler-rt/test/tsan/race_top_suppression.cc b/compiler-rt/test/tsan/race_top_suppression.cpp
index bd5c1bd5f44..bd5c1bd5f44 100644
--- a/compiler-rt/test/tsan/race_top_suppression.cc
+++ b/compiler-rt/test/tsan/race_top_suppression.cpp
diff --git a/compiler-rt/test/tsan/race_top_suppression1.cc b/compiler-rt/test/tsan/race_top_suppression1.cpp
index e34385a9b59..e34385a9b59 100644
--- a/compiler-rt/test/tsan/race_top_suppression1.cc
+++ b/compiler-rt/test/tsan/race_top_suppression1.cpp
diff --git a/compiler-rt/test/tsan/race_with_finished_thread.cc b/compiler-rt/test/tsan/race_with_finished_thread.cpp
index 755a7bd982b..755a7bd982b 100644
--- a/compiler-rt/test/tsan/race_with_finished_thread.cc
+++ b/compiler-rt/test/tsan/race_with_finished_thread.cpp
diff --git a/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc b/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cpp
index 8106ab87222..8106ab87222 100644
--- a/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc
+++ b/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cpp
diff --git a/compiler-rt/test/tsan/restore_stack.cc b/compiler-rt/test/tsan/restore_stack.cpp
index 4a5bee64400..4ffce700503 100644
--- a/compiler-rt/test/tsan/restore_stack.cc
+++ b/compiler-rt/test/tsan/restore_stack.cpp
@@ -39,10 +39,10 @@ int main() {
 
 // Previously this test produced bogus stack traces like:
 //   Previous write of size 8 at 0x0000006a8ff8 by thread T17:
-//     #0 foo() restore_stack.cc:13:5 (restore_stack.cc.exe+0x00000040622c)
-//     #1 Thread(void*) restore_stack.cc:18:3 (restore_stack.cc.exe+0x000000406283)
-//     #2 __tsan_thread_start_func rtl/tsan_interceptors.cpp:886 (restore_stack.cc.exe+0x00000040a749)
-//     #3 Thread(void*) restore_stack.cc:18:3 (restore_stack.cc.exe+0x000000406283)
+//     #0 foo() restore_stack.cpp:13:5 (restore_stack.cpp.exe+0x00000040622c)
+//     #1 Thread(void*) restore_stack.cpp:18:3 (restore_stack.cpp.exe+0x000000406283)
+//     #2 __tsan_thread_start_func rtl/tsan_interceptors.cpp:886 (restore_stack.cpp.exe+0x00000040a749)
+//     #3 Thread(void*) restore_stack.cpp:18:3 (restore_stack.cpp.exe+0x000000406283)
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK-NOT: __tsan_thread_start_func
diff --git a/compiler-rt/test/tsan/signal_block.cc b/compiler-rt/test/tsan/signal_block.cpp
index dfd4259c43c..dfd4259c43c 100644
--- a/compiler-rt/test/tsan/signal_block.cc
+++ b/compiler-rt/test/tsan/signal_block.cpp
diff --git a/compiler-rt/test/tsan/signal_cond.cc b/compiler-rt/test/tsan/signal_cond.cpp
index 6c20dd8f2e3..6c20dd8f2e3 100644
--- a/compiler-rt/test/tsan/signal_cond.cc
+++ b/compiler-rt/test/tsan/signal_cond.cpp
diff --git a/compiler-rt/test/tsan/signal_errno.cc b/compiler-rt/test/tsan/signal_errno.cpp
index e13e156fdf6..4d88bc5c420 100644
--- a/compiler-rt/test/tsan/signal_errno.cc
+++ b/compiler-rt/test/tsan/signal_errno.cpp
@@ -46,7 +46,7 @@ int main() {
 }
 
 // CHECK: WARNING: ThreadSanitizer: signal handler spoils errno
-// CHECK:     #0 MyHandler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_errno.cc
+// CHECK:     #0 MyHandler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_errno.cpp
 // CHECK:     main
 // CHECK: SUMMARY: ThreadSanitizer: signal handler spoils errno{{.*}}MyHandler
 
diff --git a/compiler-rt/test/tsan/signal_longjmp.cc b/compiler-rt/test/tsan/signal_longjmp.cpp
index f9fa4f54f50..f9fa4f54f50 100644
--- a/compiler-rt/test/tsan/signal_longjmp.cc
+++ b/compiler-rt/test/tsan/signal_longjmp.cpp
diff --git a/compiler-rt/test/tsan/signal_malloc.cc b/compiler-rt/test/tsan/signal_malloc.cpp
index 1dccb139c41..5595ee24517 100644
--- a/compiler-rt/test/tsan/signal_malloc.cc
+++ b/compiler-rt/test/tsan/signal_malloc.cpp
@@ -6,7 +6,7 @@
 static void handler(int, siginfo_t*, void*) {
   // CHECK: WARNING: ThreadSanitizer: signal-unsafe call inside of a signal
   // CHECK:     #0 malloc
-  // CHECK:     #{{(1|2)}} handler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cc:[[@LINE+2]]
+  // CHECK:     #{{(1|2)}} handler(int, {{(__)?}}siginfo{{(_t)?}}*, void*) {{.*}}signal_malloc.cpp:[[@LINE+2]]
   // CHECK: SUMMARY: ThreadSanitizer: signal-unsafe call inside of a signal{{.*}}handler
   volatile char *p = (char*)malloc(1);
   p[0] = 0;
diff --git a/compiler-rt/test/tsan/signal_pause.cc b/compiler-rt/test/tsan/signal_pause.cpp
index cbcef9491e9..cbcef9491e9 100644
--- a/compiler-rt/test/tsan/signal_pause.cc
+++ b/compiler-rt/test/tsan/signal_pause.cpp
diff --git a/compiler-rt/test/tsan/signal_recursive.cc b/compiler-rt/test/tsan/signal_recursive.cpp
index 40be2d01502..40be2d01502 100644
--- a/compiler-rt/test/tsan/signal_recursive.cc
+++ b/compiler-rt/test/tsan/signal_recursive.cpp
diff --git a/compiler-rt/test/tsan/signal_reset.cc b/compiler-rt/test/tsan/signal_reset.cpp
index 82758d88238..82758d88238 100644
--- a/compiler-rt/test/tsan/signal_reset.cc
+++ b/compiler-rt/test/tsan/signal_reset.cpp
diff --git a/compiler-rt/test/tsan/signal_sync.cc b/compiler-rt/test/tsan/signal_sync.cpp
index b529a1859f5..b529a1859f5 100644
--- a/compiler-rt/test/tsan/signal_sync.cc
+++ b/compiler-rt/test/tsan/signal_sync.cpp
diff --git a/compiler-rt/test/tsan/signal_sync2.cc b/compiler-rt/test/tsan/signal_sync2.cpp
index 163f2065075..163f2065075 100644
--- a/compiler-rt/test/tsan/signal_sync2.cc
+++ b/compiler-rt/test/tsan/signal_sync2.cpp
diff --git a/compiler-rt/test/tsan/signal_thread.cc b/compiler-rt/test/tsan/signal_thread.cpp
index aa91d1ddeb1..aa91d1ddeb1 100644
--- a/compiler-rt/test/tsan/signal_thread.cc
+++ b/compiler-rt/test/tsan/signal_thread.cpp
diff --git a/compiler-rt/test/tsan/signal_write.cc b/compiler-rt/test/tsan/signal_write.cpp
index edb3d2356bd..edb3d2356bd 100644
--- a/compiler-rt/test/tsan/signal_write.cc
+++ b/compiler-rt/test/tsan/signal_write.cpp
diff --git a/compiler-rt/test/tsan/sigsuspend.cc b/compiler-rt/test/tsan/sigsuspend.cpp
index a5930d4e87a..a5930d4e87a 100644
--- a/compiler-rt/test/tsan/sigsuspend.cc
+++ b/compiler-rt/test/tsan/sigsuspend.cpp
diff --git a/compiler-rt/test/tsan/simple_race.cc b/compiler-rt/test/tsan/simple_race.cpp
index 612ce2dc0c4..612ce2dc0c4 100644
--- a/compiler-rt/test/tsan/simple_race.cc
+++ b/compiler-rt/test/tsan/simple_race.cpp
diff --git a/compiler-rt/test/tsan/simple_stack2.cc b/compiler-rt/test/tsan/simple_stack2.cpp
index bbea7130774..5428dbcde93 100644
--- a/compiler-rt/test/tsan/simple_stack2.cc
+++ b/compiler-rt/test/tsan/simple_stack2.cpp
@@ -44,10 +44,10 @@ int main() {
 
 // CHECK:      WARNING: ThreadSanitizer: data race
 // CHECK-NEXT:   Write of size 4 at {{.*}} by thread T1:
-// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack2.cc:[[@LINE-40]]{{(:10)?}} ({{.*}})
-// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack2.cc:[[@LINE-34]]{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack2.cc:[[@LINE-17]]{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-40]]{{(:10)?}} ({{.*}})
+// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-34]]{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-17]]{{(:3)?}} ({{.*}})
 // CHECK:        Previous read of size 4 at {{.*}} by main thread:
-// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack2.cc:[[@LINE-33]]{{(:22)?}} ({{.*}})
-// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack2.cc:[[@LINE-25]]{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack2.cc:[[@LINE-13]]{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-33]]{{(:22)?}} ({{.*}})
+// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-25]]{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack2.cpp:[[@LINE-13]]{{(:3)?}} ({{.*}})
diff --git a/compiler-rt/test/tsan/sleep_sync.cc b/compiler-rt/test/tsan/sleep_sync.cpp
index b2c6a1220f4..b2c6a1220f4 100644
--- a/compiler-rt/test/tsan/sleep_sync.cc
+++ b/compiler-rt/test/tsan/sleep_sync.cpp
diff --git a/compiler-rt/test/tsan/sleep_sync2.cc b/compiler-rt/test/tsan/sleep_sync2.cpp
index a1a7a3accb4..a1a7a3accb4 100644
--- a/compiler-rt/test/tsan/sleep_sync2.cc
+++ b/compiler-rt/test/tsan/sleep_sync2.cpp
diff --git a/compiler-rt/test/tsan/stack_race.cc b/compiler-rt/test/tsan/stack_race.cpp
index 1ada2953547..1ada2953547 100644
--- a/compiler-rt/test/tsan/stack_race.cc
+++ b/compiler-rt/test/tsan/stack_race.cpp
diff --git a/compiler-rt/test/tsan/stack_race2.cc b/compiler-rt/test/tsan/stack_race2.cpp
index 00e31fb96b0..00e31fb96b0 100644
--- a/compiler-rt/test/tsan/stack_race2.cc
+++ b/compiler-rt/test/tsan/stack_race2.cpp
diff --git a/compiler-rt/test/tsan/stack_sync_reuse.cc b/compiler-rt/test/tsan/stack_sync_reuse.cpp
index d2bc5cb1b28..d2bc5cb1b28 100644
--- a/compiler-rt/test/tsan/stack_sync_reuse.cc
+++ b/compiler-rt/test/tsan/stack_sync_reuse.cpp
diff --git a/compiler-rt/test/tsan/static_init1.cc b/compiler-rt/test/tsan/static_init1.cpp
index 3e6e4f9dfec..3e6e4f9dfec 100644
--- a/compiler-rt/test/tsan/static_init1.cc
+++ b/compiler-rt/test/tsan/static_init1.cpp
diff --git a/compiler-rt/test/tsan/static_init2.cc b/compiler-rt/test/tsan/static_init2.cpp
index ca2300ae680..ca2300ae680 100644
--- a/compiler-rt/test/tsan/static_init2.cc
+++ b/compiler-rt/test/tsan/static_init2.cpp
diff --git a/compiler-rt/test/tsan/static_init3.cc b/compiler-rt/test/tsan/static_init3.cpp
index 3b9fe62ae2b..3b9fe62ae2b 100644
--- a/compiler-rt/test/tsan/static_init3.cc
+++ b/compiler-rt/test/tsan/static_init3.cpp
diff --git a/compiler-rt/test/tsan/static_init4.cc b/compiler-rt/test/tsan/static_init4.cpp
index c8da78364c5..c8da78364c5 100644
--- a/compiler-rt/test/tsan/static_init4.cc
+++ b/compiler-rt/test/tsan/static_init4.cpp
diff --git a/compiler-rt/test/tsan/static_init5.cc b/compiler-rt/test/tsan/static_init5.cpp
index b334981e85b..b334981e85b 100644
--- a/compiler-rt/test/tsan/static_init5.cc
+++ b/compiler-rt/test/tsan/static_init5.cpp
diff --git a/compiler-rt/test/tsan/static_init6.cc b/compiler-rt/test/tsan/static_init6.cpp
index b334981e85b..b334981e85b 100644
--- a/compiler-rt/test/tsan/static_init6.cc
+++ b/compiler-rt/test/tsan/static_init6.cpp
diff --git a/compiler-rt/test/tsan/strerror_r.cc b/compiler-rt/test/tsan/strerror_r.cpp
index 438f54914d6..438f54914d6 100644
--- a/compiler-rt/test/tsan/strerror_r.cc
+++ b/compiler-rt/test/tsan/strerror_r.cpp
diff --git a/compiler-rt/test/tsan/sunrpc.cc b/compiler-rt/test/tsan/sunrpc.cpp
index 8e32d6d3043..8e32d6d3043 100644
--- a/compiler-rt/test/tsan/sunrpc.cc
+++ b/compiler-rt/test/tsan/sunrpc.cpp
diff --git a/compiler-rt/test/tsan/suppress_same_address.cc b/compiler-rt/test/tsan/suppress_same_address.cpp
index 3ec13ee8302..3ec13ee8302 100644
--- a/compiler-rt/test/tsan/suppress_same_address.cc
+++ b/compiler-rt/test/tsan/suppress_same_address.cpp
diff --git a/compiler-rt/test/tsan/suppress_same_stacks.cc b/compiler-rt/test/tsan/suppress_same_stacks.cpp
index 9305650eaa1..9305650eaa1 100644
--- a/compiler-rt/test/tsan/suppress_same_stacks.cc
+++ b/compiler-rt/test/tsan/suppress_same_stacks.cpp
diff --git a/compiler-rt/test/tsan/suppressions_global.cc b/compiler-rt/test/tsan/suppressions_global.cpp
index 282d261c19e..282d261c19e 100644
--- a/compiler-rt/test/tsan/suppressions_global.cc
+++ b/compiler-rt/test/tsan/suppressions_global.cpp
diff --git a/compiler-rt/test/tsan/suppressions_global.cc.supp b/compiler-rt/test/tsan/suppressions_global.cpp.supp
index 5fa8a2e43a9..5fa8a2e43a9 100644
--- a/compiler-rt/test/tsan/suppressions_global.cc.supp
+++ b/compiler-rt/test/tsan/suppressions_global.cpp.supp
diff --git a/compiler-rt/test/tsan/suppressions_mutex.cc b/compiler-rt/test/tsan/suppressions_mutex.cpp
index 5d3a5d05289..5d3a5d05289 100644
--- a/compiler-rt/test/tsan/suppressions_mutex.cc
+++ b/compiler-rt/test/tsan/suppressions_mutex.cpp
diff --git a/compiler-rt/test/tsan/suppressions_mutex.cc.supp b/compiler-rt/test/tsan/suppressions_mutex.cpp.supp
index 595febbea5c..595febbea5c 100644
--- a/compiler-rt/test/tsan/suppressions_mutex.cc.supp
+++ b/compiler-rt/test/tsan/suppressions_mutex.cpp.supp
diff --git a/compiler-rt/test/tsan/suppressions_race.cc b/compiler-rt/test/tsan/suppressions_race.cpp
index d0aeeda95e3..d0aeeda95e3 100644
--- a/compiler-rt/test/tsan/suppressions_race.cc
+++ b/compiler-rt/test/tsan/suppressions_race.cpp
diff --git a/compiler-rt/test/tsan/suppressions_race.cc.supp b/compiler-rt/test/tsan/suppressions_race.cpp.supp
index cbdba76ea93..cbdba76ea93 100644
--- a/compiler-rt/test/tsan/suppressions_race.cc.supp
+++ b/compiler-rt/test/tsan/suppressions_race.cpp.supp
diff --git a/compiler-rt/test/tsan/suppressions_race2.cc b/compiler-rt/test/tsan/suppressions_race2.cpp
index 6f8ca736d8a..6f8ca736d8a 100644
--- a/compiler-rt/test/tsan/suppressions_race2.cc
+++ b/compiler-rt/test/tsan/suppressions_race2.cpp
diff --git a/compiler-rt/test/tsan/suppressions_race2.cc.supp b/compiler-rt/test/tsan/suppressions_race2.cpp.supp
index b3c4dbc5936..b3c4dbc5936 100644
--- a/compiler-rt/test/tsan/suppressions_race2.cc.supp
+++ b/compiler-rt/test/tsan/suppressions_race2.cpp.supp
diff --git a/compiler-rt/test/tsan/thread_end_with_ignore.cc b/compiler-rt/test/tsan/thread_end_with_ignore.cpp
index 79bb08d64bc..79bb08d64bc 100644
--- a/compiler-rt/test/tsan/thread_end_with_ignore.cc
+++ b/compiler-rt/test/tsan/thread_end_with_ignore.cpp
diff --git a/compiler-rt/test/tsan/thread_end_with_ignore2.cc b/compiler-rt/test/tsan/thread_end_with_ignore2.cpp
index 9387ea488d5..9387ea488d5 100644
--- a/compiler-rt/test/tsan/thread_end_with_ignore2.cc
+++ b/compiler-rt/test/tsan/thread_end_with_ignore2.cpp
diff --git a/compiler-rt/test/tsan/thread_end_with_ignore3.cc b/compiler-rt/test/tsan/thread_end_with_ignore3.cpp
index 55688b2a543..aa93da43514 100644
--- a/compiler-rt/test/tsan/thread_end_with_ignore3.cc
+++ b/compiler-rt/test/tsan/thread_end_with_ignore3.cpp
@@ -15,8 +15,8 @@ int main() {
 // CHECK: ThreadSanitizer: main thread finished with ignores enabled
 // CHECK:   Ignore was enabled at:
 // CHECK:     #0 AnnotateIgnoreReadsBegin
-// CHECK:     #1 main {{.*}}thread_end_with_ignore3.cc:10
+// CHECK:     #1 main {{.*}}thread_end_with_ignore3.cpp:10
 // CHECK:   Ignore was enabled at:
 // CHECK:     #0 AnnotateIgnoreReadsBegin
-// CHECK:     #1 main {{.*}}thread_end_with_ignore3.cc:11
+// CHECK:     #1 main {{.*}}thread_end_with_ignore3.cpp:11
 
diff --git a/compiler-rt/test/tsan/thread_name.cc b/compiler-rt/test/tsan/thread_name.cpp
index 1fa055579ee..1fa055579ee 100644
--- a/compiler-rt/test/tsan/thread_name.cc
+++ b/compiler-rt/test/tsan/thread_name.cpp
diff --git a/compiler-rt/test/tsan/thread_name2.cc b/compiler-rt/test/tsan/thread_name2.cpp
index 9ebac29ddb5..9ebac29ddb5 100644
--- a/compiler-rt/test/tsan/thread_name2.cc
+++ b/compiler-rt/test/tsan/thread_name2.cpp
diff --git a/compiler-rt/test/tsan/tls_race.cc b/compiler-rt/test/tsan/tls_race.cpp
index dd37ff01d97..dd37ff01d97 100644
--- a/compiler-rt/test/tsan/tls_race.cc
+++ b/compiler-rt/test/tsan/tls_race.cpp
diff --git a/compiler-rt/test/tsan/tls_race2.cc b/compiler-rt/test/tsan/tls_race2.cpp
index 5968e66d5b1..5968e66d5b1 100644
--- a/compiler-rt/test/tsan/tls_race2.cc
+++ b/compiler-rt/test/tsan/tls_race2.cpp
diff --git a/compiler-rt/test/tsan/tsan-vs-gvn.cc b/compiler-rt/test/tsan/tsan-vs-gvn.cpp
index efd81ef502f..efd81ef502f 100644
--- a/compiler-rt/test/tsan/tsan-vs-gvn.cc
+++ b/compiler-rt/test/tsan/tsan-vs-gvn.cpp
diff --git a/compiler-rt/test/tsan/unaligned_norace.cc b/compiler-rt/test/tsan/unaligned_norace.cpp
index 7e360cf8704..7e360cf8704 100644
--- a/compiler-rt/test/tsan/unaligned_norace.cc
+++ b/compiler-rt/test/tsan/unaligned_norace.cpp
diff --git a/compiler-rt/test/tsan/unaligned_race.cc b/compiler-rt/test/tsan/unaligned_race.cpp
index 5850b21542d..5850b21542d 100644
--- a/compiler-rt/test/tsan/unaligned_race.cc
+++ b/compiler-rt/test/tsan/unaligned_race.cpp
diff --git a/compiler-rt/test/tsan/vfork.cc b/compiler-rt/test/tsan/vfork.cpp
index 2d669b305a9..2d669b305a9 100644
--- a/compiler-rt/test/tsan/vfork.cc
+++ b/compiler-rt/test/tsan/vfork.cpp
diff --git a/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cc b/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cpp
index 3b1e08b1689..3b1e08b1689 100644
--- a/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cc
+++ b/compiler-rt/test/tsan/virtual_inheritance_compile_bug.cpp
diff --git a/compiler-rt/test/tsan/vptr_benign_race.cc b/compiler-rt/test/tsan/vptr_benign_race.cpp
index c0068955129..c0068955129 100644
--- a/compiler-rt/test/tsan/vptr_benign_race.cc
+++ b/compiler-rt/test/tsan/vptr_benign_race.cpp
diff --git a/compiler-rt/test/tsan/vptr_harmful_race.cc b/compiler-rt/test/tsan/vptr_harmful_race.cpp
index d15b3969ab8..d15b3969ab8 100644
--- a/compiler-rt/test/tsan/vptr_harmful_race.cc
+++ b/compiler-rt/test/tsan/vptr_harmful_race.cpp
diff --git a/compiler-rt/test/tsan/vptr_harmful_race2.cc b/compiler-rt/test/tsan/vptr_harmful_race2.cpp
index a56b74c0968..a56b74c0968 100644
--- a/compiler-rt/test/tsan/vptr_harmful_race2.cc
+++ b/compiler-rt/test/tsan/vptr_harmful_race2.cpp
diff --git a/compiler-rt/test/tsan/vptr_harmful_race3.cc b/compiler-rt/test/tsan/vptr_harmful_race3.cpp
index 3810a1068d6..3810a1068d6 100644
--- a/compiler-rt/test/tsan/vptr_harmful_race3.cc
+++ b/compiler-rt/test/tsan/vptr_harmful_race3.cpp
diff --git a/compiler-rt/test/tsan/vptr_harmful_race4.cc b/compiler-rt/test/tsan/vptr_harmful_race4.cpp
index 543514de838..543514de838 100644
--- a/compiler-rt/test/tsan/vptr_harmful_race4.cc
+++ b/compiler-rt/test/tsan/vptr_harmful_race4.cpp
diff --git a/compiler-rt/test/tsan/write_in_reader_lock.cc b/compiler-rt/test/tsan/write_in_reader_lock.cpp
index 3f7cb3579f7..56aa1abebb0 100644
--- a/compiler-rt/test/tsan/write_in_reader_lock.cc
+++ b/compiler-rt/test/tsan/write_in_reader_lock.cpp
@@ -31,6 +31,6 @@ int main(int argc, char *argv[]) {
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 4 at {{.*}} by thread T1{{.*}}:
-// CHECK:     #0 Thread1(void*) {{.*}}write_in_reader_lock.cc:12
+// CHECK:     #0 Thread1(void*) {{.*}}write_in_reader_lock.cpp:12
 // CHECK:   Previous read of size 4 at {{.*}} by main thread{{.*}}:
-// CHECK:     #0 main {{.*}}write_in_reader_lock.cc:23
+// CHECK:     #0 main {{.*}}write_in_reader_lock.cpp:23