compiler-rt: Rename cc files below test/asan to cpp

See r367803 and similar other changes.

llvm-svn: 367887

422 files changed, 353 insertions, 353 deletions

diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index f69d6b83eb4..0b01ab50195 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -281,7 +281,7 @@ append_list_if(COMPILER_RT_HAS_FNO_LTO_FLAG -fno-lto SANITIZER_COMMON_CFLAGS)
 
 # The following is a workaround for powerpc64le. This is the only architecture
 # that requires -fno-function-sections to work properly. If lacking, the ASan
-# Linux test function-sections-are-bad.cc fails with the following error:
+# Linux test function-sections-are-bad.cpp fails with the following error:
 # 'undefined symbol: __sanitizer_unaligned_load32'.
 if(DEFINED TARGET_powerpc64le_CFLAGS)
   append_list_if(COMPILER_RT_HAS_FNO_FUNCTION_SECTIONS_FLAG -fno-function-sections TARGET_powerpc64le_CFLAGS)
diff --git a/compiler-rt/lib/asan/tests/asan_test.cpp b/compiler-rt/lib/asan/tests/asan_test.cpp
index 1318727c8c5..47bba08cc23 100644
--- a/compiler-rt/lib/asan/tests/asan_test.cpp
+++ b/compiler-rt/lib/asan/tests/asan_test.cpp
@@ -531,7 +531,7 @@ TEST(AddressSanitizer, ManyStackObjectsTest) {
 #endif
 
 #if 0  // This test requires online symbolizer.
-// Moved to lit_tests/stack-oob-frames.cc.
+// Moved to lit_tests/stack-oob-frames.cpp.
 // Reenable here once we have online symbolizer by default.
 NOINLINE static void Frame0(int frame, char *a, char *b, char *c) {
   char d[4] = {0};
diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index ad906056688..ed1cf010b6f 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -85,7 +85,7 @@ run_lint ${ASAN_RTL_LINT_FILTER} ${ASAN_RTL}/*.cpp \
                                  ${ASAN_RTL}/*.h &
 run_lint ${ASAN_TEST_LINT_FILTER} ${ASAN_RTL}/tests/*.cpp \
                                   ${ASAN_RTL}/tests/*.h &
-run_lint ${ASAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/asan/*/*.cc &
+run_lint ${ASAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/asan/*/*.cpp &
 
 # TSan
 TSAN_RTL=${COMPILER_RT}/lib/tsan
@@ -122,7 +122,7 @@ run_lint ${SCUDO_RTL_LINT_FILTER} ${SCUDO_RTL}/*.cpp \
 FILES=${COMMON_RTL}/*.inc
 TMPFILES=""
 for FILE in $FILES; do
-  TMPFILE="$(${MKTEMP}).$(basename ${FILE}).cc"
+  TMPFILE="$(${MKTEMP}).$(basename ${FILE}).cpp"
   cp -f $FILE $TMPFILE
   run_lint ${COMMON_RTL_INC_LINT_FILTER} $TMPFILE &
   TMPFILES="$TMPFILES $TMPFILE"
diff --git a/compiler-rt/test/asan/TestCases/Darwin/abort_on_error.cc b/compiler-rt/test/asan/TestCases/Darwin/abort_on_error.cpp
index 0aa1234149d..7ee473b74b1 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/abort_on_error.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/abort_on_error.cpp
@@ -1,5 +1,5 @@
 // Check that with empty ASAN_OPTIONS, ASan reports on OS X actually crash
-// the process (abort_on_error=1). See also Linux/abort_on_error.cc.
+// the process (abort_on_error=1). See also Linux/abort_on_error.cpp.
 
 // RUN: %clangxx_asan %s -o %t
 
diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cc b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp
index ec4ae006825..cb96ff76210 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp
@@ -23,7 +23,7 @@
 // CHECK-FS: WRITE of size 4
 
 extern "C" void foo(int* a) {
-  // CHECK-FS: #0 0x{{.+}} in foo {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cc:[[@LINE+1]]
+  // CHECK-FS: #0 0x{{.+}} in foo {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cpp:[[@LINE+1]]
   *a = 5;
 }
 
@@ -32,7 +32,7 @@ int main() {
   if (!a)
     return 0;
   free(a);
-  // CHECK-FS: #1 0x{{.+}} in main {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cc:[[@LINE+1]]
+  // CHECK-FS: #1 0x{{.+}} in main {{.*}}asan-symbolize-partial-report-no-external-symbolizer.cpp:[[@LINE+1]]
   foo(a);
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp
index 23ca8e6399d..c9a9c4521b9 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp
@@ -25,7 +25,7 @@
 // CHECK-FS: WRITE of size 4
 
 extern "C" void foo(int* a) {
-  // CHECK-FS: #0 0x{{.+}} in foo {{.*}}asan-symbolize-partial-report-with-module-map.cc:[[@LINE+1]]
+  // CHECK-FS: #0 0x{{.+}} in foo {{.*}}asan-symbolize-partial-report-with-module-map.cpp:[[@LINE+1]]
   *a = 5;
 }
 
@@ -34,7 +34,7 @@ int main() {
   if (!a)
     return 0;
   free(a);
-  // CHECK-FS: #1 0x{{.+}} in main {{.*}}asan-symbolize-partial-report-with-module-map.cc:[[@LINE+1]]
+  // CHECK-FS: #1 0x{{.+}} in main {{.*}}asan-symbolize-partial-report-with-module-map.cpp:[[@LINE+1]]
   foo(a);
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cc b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp
index 4557adeb0d7..56e1e99409c 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp
@@ -16,7 +16,7 @@
 // CHECK-MM: WRITE of size 4
 
 extern "C" void foo(int* a) {
-  // CHECK-MM: #0 0x{{.+}} in foo {{.*}}asan-symbolize-with-module-map.cc:[[@LINE+1]]
+  // CHECK-MM: #0 0x{{.+}} in foo {{.*}}asan-symbolize-with-module-map.cpp:[[@LINE+1]]
   *a = 5;
 }
 
@@ -25,7 +25,7 @@ int main() {
   if (!a)
     return 0;
   free(a);
-  // CHECK-MM: #1 0x{{.+}} in main {{.*}}asan-symbolize-with-module-map.cc:[[@LINE+1]]
+  // CHECK-MM: #1 0x{{.+}} in main {{.*}}asan-symbolize-with-module-map.cpp:[[@LINE+1]]
   foo(a);
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cc b/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cpp
index fe337433d08..fe337433d08 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cc b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp
index fc3d0dd0b40..664471b6987 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp
@@ -20,11 +20,11 @@ int main(int argc, char **argv) {
   // CHECK: Using atos at user-specified path:
   // CHECK: AddressSanitizer: attempting double-free{{.*}}in thread T0
   // CHECK: #0 0x{{.*}} in {{.*}}free
-  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer-dyld-root-path.cc:[[@LINE-4]]
+  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer-dyld-root-path.cpp:[[@LINE-4]]
   // CHECK: freed by thread T0 here:
   // CHECK: #0 0x{{.*}} in {{.*}}free
-  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer-dyld-root-path.cc:[[@LINE-8]]
+  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer-dyld-root-path.cpp:[[@LINE-8]]
   // CHECK: allocated by thread T0 here:
-  // CHECK: atos-symbolizer-dyld-root-path.cc:[[@LINE-13]]
+  // CHECK: atos-symbolizer-dyld-root-path.cpp:[[@LINE-13]]
   return res;
 }
diff --git a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cc b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp
index e7d7e7a17fb..bab4e4f3765 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp
@@ -17,11 +17,11 @@ int main(int argc, char **argv) {
   // CHECK: Using atos at user-specified path:
   // CHECK: AddressSanitizer: attempting double-free{{.*}}in thread T0
   // CHECK: #0 0x{{.*}} in {{.*}}free
-  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer.cc:[[@LINE-4]]
+  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer.cpp:[[@LINE-4]]
   // CHECK: freed by thread T0 here:
   // CHECK: #0 0x{{.*}} in {{.*}}free
-  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer.cc:[[@LINE-8]]
+  // CHECK: #1 0x{{.*}} in main {{.*}}atos-symbolizer.cpp:[[@LINE-8]]
   // CHECK: allocated by thread T0 here:
-  // CHECK: atos-symbolizer.cc:[[@LINE-13]]
+  // CHECK: atos-symbolizer.cpp:[[@LINE-13]]
   return res;
 }
diff --git a/compiler-rt/test/asan/TestCases/Darwin/dladdr-demangling.cc b/compiler-rt/test/asan/TestCases/Darwin/dladdr-demangling.cpp
index fb6f6d79b5f..fb6f6d79b5f 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/dladdr-demangling.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/dladdr-demangling.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/dump_registers.cc b/compiler-rt/test/asan/TestCases/Darwin/dump_registers.cpp
index cc2710f062d..cc2710f062d 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/dump_registers.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/dump_registers.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cc b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp
index d195258d71f..d195258d71f 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cc b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp
index 0672e064a19..0672e064a19 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/empty-section.cc b/compiler-rt/test/asan/TestCases/Darwin/empty-section.cpp
index 5b006b54548..5b006b54548 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/empty-section.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/empty-section.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/haswell-symbolication.cc b/compiler-rt/test/asan/TestCases/Darwin/haswell-symbolication.cpp
index 7856c4d61e1..f5ed831f222 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/haswell-symbolication.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/haswell-symbolication.cpp
@@ -84,7 +84,7 @@ extern "C"
 void faulty_func(char *p) {
   *p = 'x';  // BOOM
   // CHECK: AddressSanitizer: global-buffer-overflow
-  // CHECK-LI: #0 0x{{.*}} in faulty_func{{.*}} {{.*}}haswell-symbolication.cc:[[@LINE-2]]
+  // CHECK-LI: #0 0x{{.*}} in faulty_func{{.*}} {{.*}}haswell-symbolication.cpp:[[@LINE-2]]
   // CHECK-NOLI: #0 0x{{.*}} in faulty_func{{.*}} {{.*}}haswell-symbolication
   // CHECK: is located 2 bytes to the right of global variable 'faulty_global'
   // CHECK-NOT: LLVMSymbolizer: error reading file
diff --git a/compiler-rt/test/asan/TestCases/Darwin/init_for_dlopen.cc b/compiler-rt/test/asan/TestCases/Darwin/init_for_dlopen.cpp
index 8a0fbf943b6..8a0fbf943b6 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/init_for_dlopen.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/init_for_dlopen.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cc b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
index a8e2bcb3ebc..a8e2bcb3ebc 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/linked-only.cc b/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp
index bb19ea8535e..bb19ea8535e 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/linked-only.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/malloc_destroy_zone.cc b/compiler-rt/test/asan/TestCases/Darwin/malloc_destroy_zone.cpp
index 9144bd689f7..9144bd689f7 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/malloc_destroy_zone.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/malloc_destroy_zone.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cc b/compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cpp
index b9b96ef0504..b9b96ef0504 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/malloc_set_zone_name-mprotect.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cc b/compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cpp
index 362b60e20b5..362b60e20b5 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/malloc_zone-protected.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/mixing-global-constructors.cc b/compiler-rt/test/asan/TestCases/Darwin/mixing-global-constructors.cpp
index 0b0f15cc78d..0b0f15cc78d 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/mixing-global-constructors.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/mixing-global-constructors.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/odr-lto.cc b/compiler-rt/test/asan/TestCases/Darwin/odr-lto.cpp
index e1e454be077..e1e454be077 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/odr-lto.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/odr-lto.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc b/compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cpp
index bee23f25c89..bee23f25c89 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/reexec-insert-libraries-env.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/sandbox-symbolizer.cc b/compiler-rt/test/asan/TestCases/Darwin/sandbox-symbolizer.cpp
index b36c4faedd5..b36c4faedd5 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/sandbox-symbolizer.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/sandbox-symbolizer.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/scribble.cc b/compiler-rt/test/asan/TestCases/Darwin/scribble.cpp
index 8303cf316a9..8303cf316a9 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/scribble.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/scribble.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc b/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cpp
index 8c207b102cb..8c207b102cb 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-darwin.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-function.cc b/compiler-rt/test/asan/TestCases/Darwin/suppressions-function.cpp
index f58796fb878..f58796fb878 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-function.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-function.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cc b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp
index 966f21346e4..966f21346e4 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp
diff --git a/compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc b/compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cpp
index 38fb3aa5584..a4fa047449b 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/unset-insert-libraries-on-exec.cpp
@@ -2,7 +2,7 @@
 // executing other programs.
 
 // RUN: %clangxx_asan %s -o %t
-// RUN: %clangxx %p/../Helpers/echo-env.cc -o %t-echo-env
+// RUN: %clangxx %p/../Helpers/echo-env.cpp -o %t-echo-env
 // RUN: %clangxx -DSHARED_LIB %s \
 // RUN:     -dynamiclib -o %t-darwin-dummy-shared-lib-so.dylib
 
diff --git a/compiler-rt/test/asan/TestCases/Darwin/uuid.cc b/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp
index 33638587e12..ba2d4494d3d 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/uuid.cc
+++ b/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp
@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) {
   memcpy(mybuf, x, 10);
   // CHECK: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
   // CHECK: Process module map:
-  // CHECK: uuid.cc.tmp {{.*}} <[[UUID]]>
+  // CHECK: uuid.cpp.tmp {{.*}} <[[UUID]]>
 
   fprintf(stderr, "Done.\n");
 }
diff --git a/compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cpp
index 627115cdda2..627115cdda2 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/blacklist-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/echo-env.cc b/compiler-rt/test/asan/TestCases/Helpers/echo-env.cpp
index 65e91c155c8..48b46fcd8bb 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/echo-env.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/echo-env.cpp
@@ -1,5 +1,5 @@
 // Helper binary for
-// lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cc
+// lit_tests/TestCases/Darwin/unset-insert-libraries-on-exec.cpp
 // Prints the environment variable with the given name.
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cpp
index e4189d19d09..e4189d19d09 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/init-order-atexit-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cpp
index 09aed2112d5..09aed2112d5 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cpp
index 69455a0a6fc..69455a0a6fc 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist-extra2.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt
index 83294635622..27e49e25f67 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-blacklist.txt
@@ -1,3 +1,3 @@
 global:*badGlobal*=init
 type:*badNamespace::BadClass*=init
-src:*initialization-blacklist-extra2.cc=init
+src:*initialization-blacklist-extra2.cpp=init
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cpp
index 3c4cb411def..3c4cb411def 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cpp
index a3d8f190e58..a3d8f190e58 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-bug-extra2.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cpp
index b32466a981b..b32466a981b 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-constexpr-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cc b/compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cpp
index 886165affd7..886165affd7 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/initialization-nobug-extra.cpp
diff --git a/compiler-rt/test/asan/TestCases/Helpers/underflow.cc b/compiler-rt/test/asan/TestCases/Helpers/underflow.cpp
index 26979482fab..26979482fab 100644
--- a/compiler-rt/test/asan/TestCases/Helpers/underflow.cc
+++ b/compiler-rt/test/asan/TestCases/Helpers/underflow.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/abort_on_error.cc b/compiler-rt/test/asan/TestCases/Linux/abort_on_error.cpp
index 3fe98995f68..a7804838835 100644
--- a/compiler-rt/test/asan/TestCases/Linux/abort_on_error.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/abort_on_error.cpp
@@ -1,5 +1,5 @@
 // Check that with empty ASAN_OPTIONS, ASan reports on Linux don't crash
-// the process (abort_on_error=0). See also Darwin/abort_on_error.cc.
+// the process (abort_on_error=0). See also Darwin/abort_on_error.cpp.
 
 // RUN: %clangxx_asan %s -o %t
 
diff --git a/compiler-rt/test/asan/TestCases/Linux/activation-options.cc b/compiler-rt/test/asan/TestCases/Linux/activation-options.cpp
index 39924c4b1d0..0074a6699d3 100644
--- a/compiler-rt/test/asan/TestCases/Linux/activation-options.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/activation-options.cpp
@@ -6,9 +6,9 @@
 // RUN: %clangxx -O0 %s -c -o %t.o
 // RUN: %clangxx_asan -O0 %t.o %libdl -o %t
 
-// RUN: rm -f %t.asan.options.activation-options.cc.tmp
+// RUN: rm -f %t.asan.options.activation-options.cpp.tmp
 // RUN: rm -f %t.asan.options.ABCDE
-// RUN: echo "help=1" >%t.asan.options.activation-options.cc.tmp
+// RUN: echo "help=1" >%t.asan.options.activation-options.cpp.tmp
 
 // RUN: %env_asan_opts=start_deactivated=1 \
 // RUN:   ASAN_ACTIVATION_OPTIONS=include=%t.asan.options.%b %run %t 2>&1 | \
diff --git a/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc b/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cpp
index 2325242e05a..2325242e05a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cc b/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp
index c450ae5bb8e..c450ae5bb8e 100644
--- a/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_default_suppressions.cc b/compiler-rt/test/asan/TestCases/Linux/asan_default_suppressions.cpp
index 5ff59c1dfe7..5ff59c1dfe7 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_default_suppressions.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_default_suppressions.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_dlopen_test.cc b/compiler-rt/test/asan/TestCases/Linux/asan_dlopen_test.cpp
index 5081b775321..5081b775321 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_dlopen_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_dlopen_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cc b/compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cpp
index e00c215e92b..e00c215e92b 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_prelink_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cpp
index e11bd623ddb..e11bd623ddb 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cpp
index 817c560d42a..817c560d42a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-3.cc b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-3.cpp
index e998ff647b2..e998ff647b2 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-3.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-3.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-1.cc b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-1.cpp
index 8cf761c905f..8cf761c905f 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-1.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-1.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cpp
index 6328cbb2ce8..6328cbb2ce8 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/auto_memory_profile_test.cc b/compiler-rt/test/asan/TestCases/Linux/auto_memory_profile_test.cpp
index 3f8ad4673e7..3f8ad4673e7 100644
--- a/compiler-rt/test/asan/TestCases/Linux/auto_memory_profile_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/auto_memory_profile_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/bzero.cc b/compiler-rt/test/asan/TestCases/Linux/bzero.cpp
index 430edb74469..430edb74469 100644
--- a/compiler-rt/test/asan/TestCases/Linux/bzero.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/bzero.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/clang_gcc_abi.cc b/compiler-rt/test/asan/TestCases/Linux/clang_gcc_abi.cpp
index e0ae3f1f8af..0c3fa0aed7d 100644
--- a/compiler-rt/test/asan/TestCases/Linux/clang_gcc_abi.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/clang_gcc_abi.cpp
@@ -11,12 +11,12 @@ __attribute__((noinline))
 int boom() {
   volatile int three = 3;
   char * volatile s = (char *)malloc(three);
-// CHECK: #1 0x{{.*}} in boom {{.*}}clang_gcc_abi.cc:[[@LINE-1]]
+// CHECK: #1 0x{{.*}} in boom {{.*}}clang_gcc_abi.cpp:[[@LINE-1]]
   return s[three]; //BOOM
 }
 
 __attribute__((naked, noinline)) void gcc_abi() {
-// CHECK: #2 0x{{.*}} in gcc_abi {{.*}}clang_gcc_abi.cc:[[@LINE+1]]
+// CHECK: #2 0x{{.*}} in gcc_abi {{.*}}clang_gcc_abi.cpp:[[@LINE+1]]
   asm volatile("str fp, [sp, #-8]!\n\t"
                "str lr, [sp, #4]\n\t"
                "add fp, sp, #4\n\t"
@@ -29,7 +29,7 @@ __attribute__((naked, noinline)) void gcc_abi() {
 }
 
 __attribute__((naked, noinline)) void clang_abi() {
-// CHECK: #3 0x{{.*}} in clang_abi {{.*}}clang_gcc_abi.cc:[[@LINE+1]]
+// CHECK: #3 0x{{.*}} in clang_abi {{.*}}clang_gcc_abi.cpp:[[@LINE+1]]
   asm volatile("push {r11, lr}\n\t"
                "mov r11, sp\n\t"
                "bl  gcc_abi\n\t"
@@ -40,5 +40,5 @@ __attribute__((naked, noinline)) void clang_abi() {
 
 int main() {
   clang_abi();
-// CHECK: #4 0x{{.*}} in main {{.*}}clang_gcc_abi.cc:[[@LINE-1]]
+// CHECK: #4 0x{{.*}} in main {{.*}}clang_gcc_abi.cpp:[[@LINE-1]]
 }
diff --git a/compiler-rt/test/asan/TestCases/Linux/clone_test.cc b/compiler-rt/test/asan/TestCases/Linux/clone_test.cpp
index 0b86238ccad..0b86238ccad 100644
--- a/compiler-rt/test/asan/TestCases/Linux/clone_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/clone_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-missing.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-missing.cpp
index 10acef9af4b..10acef9af4b 100644
--- a/compiler-rt/test/asan/TestCases/Linux/coverage-missing.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/coverage-missing.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/cuda_test.cc b/compiler-rt/test/asan/TestCases/Linux/cuda_test.cpp
index e532f2ee7bf..e532f2ee7bf 100644
--- a/compiler-rt/test/asan/TestCases/Linux/cuda_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/cuda_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cc b/compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cpp
index 15aaccbc957..15aaccbc957 100644
--- a/compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/function-sections-are-bad.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/global-overflow-bfd.cc b/compiler-rt/test/asan/TestCases/Linux/global-overflow-bfd.cpp
index 117a761af91..117a761af91 100644
--- a/compiler-rt/test/asan/TestCases/Linux/global-overflow-bfd.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/global-overflow-bfd.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/global-overflow-lld.cc b/compiler-rt/test/asan/TestCases/Linux/global-overflow-lld.cpp
index f4d0bc97760..f4d0bc97760 100644
--- a/compiler-rt/test/asan/TestCases/Linux/global-overflow-lld.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/global-overflow-lld.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/globals-gc-sections-lld.cc b/compiler-rt/test/asan/TestCases/Linux/globals-gc-sections-lld.cpp
index 0d8bcdd1cb1..0d8bcdd1cb1 100644
--- a/compiler-rt/test/asan/TestCases/Linux/globals-gc-sections-lld.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/globals-gc-sections-lld.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/init-order-dlopen.cc b/compiler-rt/test/asan/TestCases/Linux/init-order-dlopen.cpp
index d469b98089f..d469b98089f 100644
--- a/compiler-rt/test/asan/TestCases/Linux/init-order-dlopen.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/init-order-dlopen.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/init_fini_sections.cc b/compiler-rt/test/asan/TestCases/Linux/init_fini_sections.cpp
index 3037b232926..3037b232926 100644
--- a/compiler-rt/test/asan/TestCases/Linux/init_fini_sections.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/init_fini_sections.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cc b/compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cpp
index 85fefd40ee0..5936cc6b99a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/initialization-bug-any-order.cpp
@@ -3,9 +3,9 @@
 // independently on order in which we list source files (if we specify
 // strict init-order checking).
 
-// RUN: %clangxx_asan -O0 %s %p/../Helpers/initialization-bug-extra.cc -o %t
+// RUN: %clangxx_asan -O0 %s %p/../Helpers/initialization-bug-extra.cpp -o %t
 // RUN: %env_asan_opts=strict_init_order=true not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -O0 %p/../Helpers/initialization-bug-extra.cc %s -o %t
+// RUN: %clangxx_asan -O0 %p/../Helpers/initialization-bug-extra.cpp %s -o %t
 // RUN: %env_asan_opts=strict_init_order=true not %run %t 2>&1 | FileCheck %s
 
 // Do not test with optimization -- the error may be optimized away.
@@ -21,7 +21,7 @@ int __attribute__((noinline)) initX() {
   return y + 1;
   // CHECK: {{AddressSanitizer: initialization-order-fiasco}}
   // CHECK: {{READ of size .* at 0x.* thread T0}}
-  // CHECK: {{#0 0x.* in .*initX.* .*initialization-bug-any-order.cc:}}[[@LINE-3]]
+  // CHECK: {{#0 0x.* in .*initX.* .*initialization-bug-any-order.cpp:}}[[@LINE-3]]
   // CHECK: {{0x.* is located 0 bytes inside of global variable .*y.*}}
 }
 
diff --git a/compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cpp
index f6d6d340bd9..f6d6d340bd9 100644
--- a/compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/interception_malloc_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cpp
index 987dff27523..987dff27523 100644
--- a/compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/interception_readdir_r_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/interception_test.cc b/compiler-rt/test/asan/TestCases/Linux/interception_test.cpp
index fb9d01cfe6d..fb9d01cfe6d 100644
--- a/compiler-rt/test/asan/TestCases/Linux/interception_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/interception_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cc b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
index 8c22976e710..8c22976e710 100644
--- a/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/interface_symbols_linux.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc b/compiler-rt/test/asan/TestCases/Linux/kernel-area.cpp
index 41b507cdfe0..41b507cdfe0 100644
--- a/compiler-rt/test/asan/TestCases/Linux/kernel-area.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/kernel-area.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/leak.cc b/compiler-rt/test/asan/TestCases/Linux/leak.cpp
index e22cd6eac16..e22cd6eac16 100644
--- a/compiler-rt/test/asan/TestCases/Linux/leak.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/leak.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cc b/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cpp
index 2a2010f7ab0..2a2010f7ab0 100644
--- a/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/local_alias.cc b/compiler-rt/test/asan/TestCases/Linux/local_alias.cpp
index a8b3d75e375..a8b3d75e375 100644
--- a/compiler-rt/test/asan/TestCases/Linux/local_alias.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/local_alias.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/long-object-path.cc b/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp
index 592b0abb07d..592b0abb07d 100644
--- a/compiler-rt/test/asan/TestCases/Linux/long-object-path.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cpp
index ea239244290..ea239244290 100644
--- a/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/malloc-in-qsort.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cc b/compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cpp
index 50d920e43f3..50d920e43f3 100644
--- a/compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/malloc_delete_mismatch.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/memmem_test.cc b/compiler-rt/test/asan/TestCases/Linux/memmem_test.cpp
index a838cb56af5..a838cb56af5 100644
--- a/compiler-rt/test/asan/TestCases/Linux/memmem_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/memmem_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/mincore.cc b/compiler-rt/test/asan/TestCases/Linux/mincore.cpp
index 30f450830fc..30f450830fc 100644
--- a/compiler-rt/test/asan/TestCases/Linux/mincore.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/mincore.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cpp
index 05f74bda754..05f74bda754 100644
--- a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_global.cc b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_global.cpp
index 3f1a78715ca..3f1a78715ca 100644
--- a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_global.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_global.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_stack.cc b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_stack.cpp
index bbf07cc2138..bbf07cc2138 100644
--- a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_stack.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch_stack.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/nohugepage_test.cc b/compiler-rt/test/asan/TestCases/Linux/nohugepage_test.cpp
index 0fd7c558d6d..0fd7c558d6d 100644
--- a/compiler-rt/test/asan/TestCases/Linux/nohugepage_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/nohugepage_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc b/compiler-rt/test/asan/TestCases/Linux/odr-violation.cpp
index a1941fcc8d7..9cdafca91b1 100644
--- a/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/odr-violation.cpp
@@ -51,7 +51,7 @@ namespace foo { char G[SZ]; }
 #include <stdio.h>
 namespace foo { char G[100]; }
 // CHECK: ERROR: AddressSanitizer: odr-violation
-// CHECK: size=100 'foo::G' {{.*}}odr-violation.cc:[[@LINE-2]]:22
+// CHECK: size=100 'foo::G' {{.*}}odr-violation.cpp:[[@LINE-2]]:22
 // CHECK: size={{4|100}} 'foo::G'
 int main(int argc, char **argv) {
   printf("PASS: %p\n", &foo::G);
@@ -60,6 +60,6 @@ int main(int argc, char **argv) {
 
 // CHECK: These globals were registered at these points:
 // CHECK: ODR-EXE
-// CHECK: odr-violation.cc.dynamic
-// CHECK: SUMMARY: AddressSanitizer: odr-violation: global 'foo::G' at {{.*}}odr-violation.cc
+// CHECK: odr-violation.cpp.dynamic
+// CHECK: SUMMARY: AddressSanitizer: odr-violation: global 'foo::G' at {{.*}}odr-violation.cpp
 // DISABLED: PASS
diff --git a/compiler-rt/test/asan/TestCases/Linux/odr-vtable.cc b/compiler-rt/test/asan/TestCases/Linux/odr-vtable.cpp
index fdbab4bb1fd..fdbab4bb1fd 100644
--- a/compiler-rt/test/asan/TestCases/Linux/odr-vtable.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/odr-vtable.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/odr_indicators.cc b/compiler-rt/test/asan/TestCases/Linux/odr_indicators.cpp
index 36176b55290..36176b55290 100644
--- a/compiler-rt/test/asan/TestCases/Linux/odr_indicators.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/odr_indicators.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc b/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cpp
index 6990518e43a..6990518e43a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/overflow-in-qsort.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/preinit_test.cc b/compiler-rt/test/asan/TestCases/Linux/preinit_test.cpp
index f8c2b6bf52f..f8c2b6bf52f 100644
--- a/compiler-rt/test/asan/TestCases/Linux/preinit_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/preinit_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc b/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cpp
index 2b50944c6f2..2b50944c6f2 100644
--- a/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/print_memory_profile_test.cc b/compiler-rt/test/asan/TestCases/Linux/print_memory_profile_test.cpp
index e7896be4059..e7896be4059 100644
--- a/compiler-rt/test/asan/TestCases/Linux/print_memory_profile_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/print_memory_profile_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/pthread_create_from_constructor.cc b/compiler-rt/test/asan/TestCases/Linux/pthread_create_from_constructor.cpp
index 8f9b0b4fed1..8f9b0b4fed1 100644
--- a/compiler-rt/test/asan/TestCases/Linux/pthread_create_from_constructor.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/pthread_create_from_constructor.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/pthread_create_version.cc b/compiler-rt/test/asan/TestCases/Linux/pthread_create_version.cpp
index efdb8ca97c4..efdb8ca97c4 100644
--- a/compiler-rt/test/asan/TestCases/Linux/pthread_create_version.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/pthread_create_version.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/ptrace.cc b/compiler-rt/test/asan/TestCases/Linux/ptrace.cpp
index bd3d2d27e1d..255bfe6b782 100644
--- a/compiler-rt/test/asan/TestCases/Linux/ptrace.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/ptrace.cpp
@@ -99,7 +99,7 @@ int main(void) {
 #endif
     res = ptrace((enum __ptrace_request)__PTRACE_REQUEST, pid, __PTRACE_ARGS);
     // CHECK: AddressSanitizer: stack-buffer-overflow
-    // CHECK: {{.*ptrace.cc:}}[[@LINE-2]]
+    // CHECK: {{.*ptrace.cpp:}}[[@LINE-2]]
     assert(!res);
     PRINT_REG_PC(regs);
 
diff --git a/compiler-rt/test/asan/TestCases/Linux/quarantine_size_mb.cc b/compiler-rt/test/asan/TestCases/Linux/quarantine_size_mb.cpp
index f7bccbfbe8d..f7bccbfbe8d 100644
--- a/compiler-rt/test/asan/TestCases/Linux/quarantine_size_mb.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/quarantine_size_mb.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/recoverable-lsan.cc b/compiler-rt/test/asan/TestCases/Linux/recoverable-lsan.cpp
index 935645327b0..935645327b0 100644
--- a/compiler-rt/test/asan/TestCases/Linux/recoverable-lsan.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/recoverable-lsan.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/recvfrom.cc b/compiler-rt/test/asan/TestCases/Linux/recvfrom.cpp
index 9c6eec35c95..46aa202c2ad 100644
--- a/compiler-rt/test/asan/TestCases/Linux/recvfrom.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/recvfrom.cpp
@@ -41,7 +41,7 @@ static void *client_thread_udp(void *data) {
   succeeded = sendto(sockfd, buf, kBufSize, 0, (struct sockaddr *)&serveraddr,
                      sizeof(serveraddr));
   // CHECK-SENDTO: {{READ of size 10 at 0x.* thread T1}}
-  // CHECK-SENDTO: {{    #1 0x.* in client_thread_udp.*recvfrom.cc:}}[[@LINE-3]]
+  // CHECK-SENDTO: {{    #1 0x.* in client_thread_udp.*recvfrom.cpp:}}[[@LINE-3]]
   CHECK_ERROR(succeeded < 0, "in sending message");
   return NULL;
 }
@@ -72,9 +72,9 @@ int main() {
 
   recvfrom(sockfd, buf, kBufSize, 0, NULL, NULL); // BOOM
   // CHECK-RECVFROM: {{WRITE of size 10 at 0x.* thread T0}}
-  // CHECK-RECVFROM: {{    #1 0x.* in main.*recvfrom.cc:}}[[@LINE-2]]
+  // CHECK-RECVFROM: {{    #1 0x.* in main.*recvfrom.cpp:}}[[@LINE-2]]
   // CHECK-RECVFROM: {{Address 0x.* is located in stack of thread T0 at offset}}
-  // CHECK-RECVFROM-NEXT: in{{.*}}main{{.*}}recvfrom.cc
+  // CHECK-RECVFROM-NEXT: in{{.*}}main{{.*}}recvfrom.cpp
   succeeded = pthread_join(client_thread, NULL);
   CHECK_ERROR(succeeded, "joining thread");
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/Linux/release_to_os_test.cc b/compiler-rt/test/asan/TestCases/Linux/release_to_os_test.cpp
index 3e28ffde46a..3e28ffde46a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/release_to_os_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/release_to_os_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cc b/compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cpp
index 7f37727b2ee..7f37727b2ee 100644
--- a/compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/rlimit_mmap_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/sanbox_read_proc_self_maps_test.cc b/compiler-rt/test/asan/TestCases/Linux/sanbox_read_proc_self_maps_test.cpp
index d9099edffca..d9099edffca 100644
--- a/compiler-rt/test/asan/TestCases/Linux/sanbox_read_proc_self_maps_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/sanbox_read_proc_self_maps_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/shmctl.cc b/compiler-rt/test/asan/TestCases/Linux/shmctl.cpp
index e1752bc894c..e1752bc894c 100644
--- a/compiler-rt/test/asan/TestCases/Linux/shmctl.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/shmctl.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cc b/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cpp
index b1a41fe20c0..b1a41fe20c0 100644
--- a/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/sized_delete_test.cc b/compiler-rt/test/asan/TestCases/Linux/sized_delete_test.cpp
index 5d8c7010e31..5d8c7010e31 100644
--- a/compiler-rt/test/asan/TestCases/Linux/sized_delete_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/sized_delete_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cpp
index e9966595378..e9966595378 100644
--- a/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/stack-overflow-sigbus.cc b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-sigbus.cpp
index 8c9599c9f61..8c9599c9f61 100644
--- a/compiler-rt/test/asan/TestCases/Linux/stack-overflow-sigbus.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-sigbus.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/stack-trace-dlclose.cc b/compiler-rt/test/asan/TestCases/Linux/stack-trace-dlclose.cpp
index 899e0dfc6bd..899e0dfc6bd 100644
--- a/compiler-rt/test/asan/TestCases/Linux/stack-trace-dlclose.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/stack-trace-dlclose.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/static_tls.cc b/compiler-rt/test/asan/TestCases/Linux/static_tls.cpp
index 5e569ddabd3..5e569ddabd3 100644
--- a/compiler-rt/test/asan/TestCases/Linux/static_tls.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/static_tls.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
index 5eae27a3216..5eae27a3216 100644
--- a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc b/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cpp
index 2660ffe3ba7..2660ffe3ba7 100644
--- a/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/syscalls.cc b/compiler-rt/test/asan/TestCases/Linux/syscalls.cpp
index ec14bca7612..ec14bca7612 100644
--- a/compiler-rt/test/asan/TestCases/Linux/syscalls.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/syscalls.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_pthread_join.cc b/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_pthread_join.cpp
index 8a5bb25ee75..8a5bb25ee75 100644
--- a/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_pthread_join.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_pthread_join.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc b/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cpp
index 46af1a0e020..46af1a0e020 100644
--- a/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/uar_signals.cc b/compiler-rt/test/asan/TestCases/Linux/uar_signals.cpp
index f96a2fecb36..f96a2fecb36 100644
--- a/compiler-rt/test/asan/TestCases/Linux/uar_signals.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/uar_signals.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc b/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cpp
index e22345342f3..e22345342f3 100644
--- a/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cpp
diff --git a/compiler-rt/test/asan/TestCases/Linux/vfork.cc b/compiler-rt/test/asan/TestCases/Linux/vfork.cpp
index 31a32dc56cd..31a32dc56cd 100644
--- a/compiler-rt/test/asan/TestCases/Linux/vfork.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/vfork.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-bad-path.cc b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-bad-path.cpp
index 3f93122e909..3f93122e909 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-bad-path.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-bad-path.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp
index 11d5928a801..6e24a08adfe 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp
@@ -38,11 +38,11 @@ int main(int argc, char *argv[]) {
   inc2(array, -1);  // BOOM
   // CHECK: ERROR: AddressSanitizer: heap-buffer-overflow
   // CHECK: READ of size 4 at 0x{{.*}}
-  // CHECK: #0 {{.*}} in inc2 {{.*}}asan-symbolize-sanity-test.cc:[[@LINE+21]]
-  // CHECK: #1 {{.*}} in main {{.*}}asan-symbolize-sanity-test.cc:[[@LINE-4]]
+  // CHECK: #0 {{.*}} in inc2 {{.*}}asan-symbolize-sanity-test.cpp:[[@LINE+21]]
+  // CHECK: #1 {{.*}} in main {{.*}}asan-symbolize-sanity-test.cpp:[[@LINE-4]]
   // CHECK: allocated by thread T{{.*}} here:
   // CHECK: #{{.*}} in {{(wrap_|__interceptor_)?}}malloc
-  // CHECK: #{{.*}} in main {{.*}}asan-symbolize-sanity-test.cc:[[@LINE-9]]
+  // CHECK: #{{.*}} in main {{.*}}asan-symbolize-sanity-test.cpp:[[@LINE-9]]
   return 0;
 }
 #else  // SHARED_LIBS
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cc b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
index b3df1cb354b..b3df1cb354b 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cc b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
index 71f32e0d6d5..71f32e0d6d5 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_symbolicate.cc b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_symbolicate.cpp
index 3f3ad9bfdf7..3f3ad9bfdf7 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_symbolicate.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_symbolicate.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_dest.cc b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_dest.cpp
index f2c30980874..f2c30980874 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_dest.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_dest.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_level.cc b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_level.cpp
index b30fd6ec3cc..b30fd6ec3cc 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_level.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/set_log_level.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/asprintf.cc b/compiler-rt/test/asan/TestCases/Posix/asprintf.cpp
index 6946e5013d2..6946e5013d2 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asprintf.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asprintf.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/assign_large_valloc_to_global.cc b/compiler-rt/test/asan/TestCases/Posix/assign_large_valloc_to_global.cpp
index 8031d04aae4..8031d04aae4 100644
--- a/compiler-rt/test/asan/TestCases/Posix/assign_large_valloc_to_global.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/assign_large_valloc_to_global.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/bcmp_test.cc b/compiler-rt/test/asan/TestCases/Posix/bcmp_test.cpp
index 44aa9cd24f6..44aa9cd24f6 100644
--- a/compiler-rt/test/asan/TestCases/Posix/bcmp_test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/bcmp_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/closed-fds.cc b/compiler-rt/test/asan/TestCases/Posix/closed-fds.cpp
index b2604bba58b..c18653bc29e 100644
--- a/compiler-rt/test/asan/TestCases/Posix/closed-fds.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/closed-fds.cpp
@@ -30,6 +30,6 @@ int main(int argc, char **argv) {
   // CHECK-FILE: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
   // CHECK-FILE:   {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
   // CHECK-FILE: {{WRITE of size 1 at 0x.* thread T0}}
-  // CHECK-FILE: {{    #0 0x.* in main .*closed-fds.cc:}}[[@LINE-4]]
+  // CHECK-FILE: {{    #0 0x.* in main .*closed-fds.cpp:}}[[@LINE-4]]
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Posix/concurrent_overflow.cc b/compiler-rt/test/asan/TestCases/Posix/concurrent_overflow.cpp
index 345b546851b..345b546851b 100644
--- a/compiler-rt/test/asan/TestCases/Posix/concurrent_overflow.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/concurrent_overflow.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage-fork.cc b/compiler-rt/test/asan/TestCases/Posix/coverage-fork.cpp
index 22d2e35842a..22d2e35842a 100644
--- a/compiler-rt/test/asan/TestCases/Posix/coverage-fork.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/coverage-fork.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage-module-unloaded.cc b/compiler-rt/test/asan/TestCases/Posix/coverage-module-unloaded.cpp
index 322a1bad1c9..322a1bad1c9 100644
--- a/compiler-rt/test/asan/TestCases/Posix/coverage-module-unloaded.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/coverage-module-unloaded.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage-reset.cc b/compiler-rt/test/asan/TestCases/Posix/coverage-reset.cpp
index 152be2ab3a2..b3b7a575a5a 100644
--- a/compiler-rt/test/asan/TestCases/Posix/coverage-reset.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/coverage-reset.cpp
@@ -29,8 +29,8 @@ int main(int argc, char **argv) {
   bar2();
   __sanitizer_cov_dump();
 // CHECK: RESET
-// CHECK-DAG: SanitizerCoverage: ./coverage-reset.cc{{.*}}.sancov: 2 PCs written
-// CHECK-DAG: SanitizerCoverage: ./libcoverage-reset.cc{{.*}}.sancov: 2 PCs written
+// CHECK-DAG: SanitizerCoverage: ./coverage-reset.cpp{{.*}}.sancov: 2 PCs written
+// CHECK-DAG: SanitizerCoverage: ./libcoverage-reset.cpp{{.*}}.sancov: 2 PCs written
 
   fprintf(stderr, "RESET\n");
   __sanitizer_cov_reset();
@@ -38,8 +38,8 @@ int main(int argc, char **argv) {
   bar1();
   __sanitizer_cov_dump();
 // CHECK: RESET
-// CHECK-DAG: SanitizerCoverage: ./coverage-reset.cc{{.*}}.sancov: 1 PCs written
-// CHECK-DAG: SanitizerCoverage: ./libcoverage-reset.cc{{.*}}.sancov: 1 PCs written
+// CHECK-DAG: SanitizerCoverage: ./coverage-reset.cpp{{.*}}.sancov: 1 PCs written
+// CHECK-DAG: SanitizerCoverage: ./libcoverage-reset.cpp{{.*}}.sancov: 1 PCs written
 
   fprintf(stderr, "RESET\n");
   __sanitizer_cov_reset();
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
   foo2();
   __sanitizer_cov_dump();
 // CHECK: RESET
-// CHECK: SanitizerCoverage: ./coverage-reset.cc{{.*}}.sancov: 2 PCs written
+// CHECK: SanitizerCoverage: ./coverage-reset.cpp{{.*}}.sancov: 2 PCs written
 
   fprintf(stderr, "RESET\n");
   __sanitizer_cov_reset();
@@ -55,13 +55,13 @@ int main(int argc, char **argv) {
   bar2();
   __sanitizer_cov_dump();
 // CHECK: RESET
-// CHECK: SanitizerCoverage: ./libcoverage-reset.cc{{.*}}.sancov: 2 PCs written
+// CHECK: SanitizerCoverage: ./libcoverage-reset.cpp{{.*}}.sancov: 2 PCs written
 
   fprintf(stderr, "RESET\n");
   __sanitizer_cov_reset();
 // CHECK: RESET
 
   bar2();
-// CHECK: SanitizerCoverage: ./libcoverage-reset.cc{{.*}}.sancov: 1 PCs written
+// CHECK: SanitizerCoverage: ./libcoverage-reset.cpp{{.*}}.sancov: 1 PCs written
 }
 #endif
diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage.cc b/compiler-rt/test/asan/TestCases/Posix/coverage.cpp
index 9dbd72eabd2..9dbd72eabd2 100644
--- a/compiler-rt/test/asan/TestCases/Posix/coverage.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/coverage.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/current_allocated_bytes.cc b/compiler-rt/test/asan/TestCases/Posix/current_allocated_bytes.cpp
index c49e433b1e8..c49e433b1e8 100644
--- a/compiler-rt/test/asan/TestCases/Posix/current_allocated_bytes.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/current_allocated_bytes.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cc b/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp
index e6e82a47572..e6e82a47572 100644
--- a/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/deep_thread_stack.cc b/compiler-rt/test/asan/TestCases/Posix/deep_thread_stack.cpp
index 535da79ff58..535da79ff58 100644
--- a/compiler-rt/test/asan/TestCases/Posix/deep_thread_stack.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/deep_thread_stack.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/dlclose-test.cc b/compiler-rt/test/asan/TestCases/Posix/dlclose-test.cpp
index 160c1c940e6..160c1c940e6 100644
--- a/compiler-rt/test/asan/TestCases/Posix/dlclose-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/dlclose-test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/fgets_fputs.cc b/compiler-rt/test/asan/TestCases/Posix/fgets_fputs.cpp
index 34c952f2e02..34c952f2e02 100644
--- a/compiler-rt/test/asan/TestCases/Posix/fgets_fputs.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/fgets_fputs.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc b/compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cpp
index c0629260418..c0629260418 100644
--- a/compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/fread_fwrite.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/free_hook_realloc.cc b/compiler-rt/test/asan/TestCases/Posix/free_hook_realloc.cpp
index cbc5d6fed56..cbc5d6fed56 100644
--- a/compiler-rt/test/asan/TestCases/Posix/free_hook_realloc.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/free_hook_realloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/freopen.cc b/compiler-rt/test/asan/TestCases/Posix/freopen.cpp
index c137abb8fcb..c137abb8fcb 100644
--- a/compiler-rt/test/asan/TestCases/Posix/freopen.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/freopen.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/gc-test.cc b/compiler-rt/test/asan/TestCases/Posix/gc-test.cpp
index 56d8c398fc7..56d8c398fc7 100644
--- a/compiler-rt/test/asan/TestCases/Posix/gc-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/gc-test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/glob.cc b/compiler-rt/test/asan/TestCases/Posix/glob.cpp
index 16b4ace8efc..16b4ace8efc 100644
--- a/compiler-rt/test/asan/TestCases/Posix/glob.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/glob.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc b/compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cpp
index 559f9434e39..559f9434e39 100644
--- a/compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc b/compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cpp
index 6b926180cc2..6b926180cc2 100644
--- a/compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/handle_abort_on_error.cc b/compiler-rt/test/asan/TestCases/Posix/handle_abort_on_error.cpp
index 1be060e06aa..1be060e06aa 100644
--- a/compiler-rt/test/asan/TestCases/Posix/handle_abort_on_error.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/handle_abort_on_error.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/init-order-pthread-create.cc b/compiler-rt/test/asan/TestCases/Posix/init-order-pthread-create.cpp
index 19c000fec43..19c000fec43 100644
--- a/compiler-rt/test/asan/TestCases/Posix/init-order-pthread-create.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/init-order-pthread-create.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/interception-in-shared-lib-test.cc b/compiler-rt/test/asan/TestCases/Posix/interception-in-shared-lib-test.cpp
index b31b035f9e4..455390a8dbd 100644
--- a/compiler-rt/test/asan/TestCases/Posix/interception-in-shared-lib-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/interception-in-shared-lib-test.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[]) {
   my_memset(buf, 11);
   // CHECK: {{.*ERROR: AddressSanitizer: stack-buffer-overflow}}
   // CHECK: {{WRITE of size 11 at 0x.* thread T0}}
-  // CHECK: {{0x.* in my_memset .*interception-in-shared-lib-test.cc:}}[[@LINE-10]]
+  // CHECK: {{0x.* in my_memset .*interception-in-shared-lib-test.cpp:}}[[@LINE-10]]
   return 0;
 }
 #endif
diff --git a/compiler-rt/test/asan/TestCases/Posix/invalid-pointer-pairs-threads.cc b/compiler-rt/test/asan/TestCases/Posix/invalid-pointer-pairs-threads.cpp
index ee8a1c70cf0..d32dae9c01e 100644
--- a/compiler-rt/test/asan/TestCases/Posix/invalid-pointer-pairs-threads.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/invalid-pointer-pairs-threads.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv) {
     char *parent_pointer = &local;
 
     // B: ERROR: AddressSanitizer: invalid-pointer-pair
-    // B: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-threads.cc:[[@LINE+1]]
+    // B: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-threads.cpp:[[@LINE+1]]
     unsigned r = parent_pointer - pointers[0];
   }
 
diff --git a/compiler-rt/test/asan/TestCases/Posix/ioctl.cc b/compiler-rt/test/asan/TestCases/Posix/ioctl.cpp
index 7269dfddb9b..c871f94e137 100644
--- a/compiler-rt/test/asan/TestCases/Posix/ioctl.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/ioctl.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
   int res = ioctl(fd, FIONBIO, &nonblock + 1);
   // CHECK: AddressSanitizer: stack-buffer-overflow
   // CHECK: READ of size 4 at
-  // CHECK: {{#.* in main .*ioctl.cc:}}[[@LINE-3]]
+  // CHECK: {{#.* in main .*ioctl.cpp:}}[[@LINE-3]]
   assert(res == 0);
   close(fd);
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/Posix/large_allocator_unpoisons_on_free.cc b/compiler-rt/test/asan/TestCases/Posix/large_allocator_unpoisons_on_free.cpp
index b39fa74a314..b39fa74a314 100644
--- a/compiler-rt/test/asan/TestCases/Posix/large_allocator_unpoisons_on_free.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/large_allocator_unpoisons_on_free.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/lto-constmerge-odr.cc b/compiler-rt/test/asan/TestCases/Posix/lto-constmerge-odr.cpp
index 9dc1397f6f0..9dc1397f6f0 100644
--- a/compiler-rt/test/asan/TestCases/Posix/lto-constmerge-odr.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/lto-constmerge-odr.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/mmap_limit_mb.cc b/compiler-rt/test/asan/TestCases/Posix/mmap_limit_mb.cpp
index cb613f53577..cb613f53577 100644
--- a/compiler-rt/test/asan/TestCases/Posix/mmap_limit_mb.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/mmap_limit_mb.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_test.cc b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_test.cpp
index 40a9b78749b..edbdb4016d8 100644
--- a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_test.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
   C *buffer = new C[argc];
   buffer[-2].x = 10;
 // CHECK: AddressSanitizer: heap-buffer-overflow
-// CHECK: in main {{.*}}new_array_cookie_test.cc:[[@LINE-2]]
+// CHECK: in main {{.*}}new_array_cookie_test.cpp:[[@LINE-2]]
 // CHECK: is located 0 bytes inside of 12-byte region
 // NO_COOKIE: ZZZZZZZZ
   delete [] buffer;
diff --git a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_uaf_test.cc b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_uaf_test.cpp
index 335a56757d2..335a56757d2 100644
--- a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_uaf_test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_uaf_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cc b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp
index e7f774674e2..e7f774674e2 100644
--- a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/no-fd.cc b/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp
index 086b01412dd..086b01412dd 100644
--- a/compiler-rt/test/asan/TestCases/Posix/no-fd.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/print_cmdline.cc b/compiler-rt/test/asan/TestCases/Posix/print_cmdline.cpp
index 8c83bd97e0c..8c83bd97e0c 100644
--- a/compiler-rt/test/asan/TestCases/Posix/print_cmdline.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/print_cmdline.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/readv.cc b/compiler-rt/test/asan/TestCases/Posix/readv.cpp
index 27436a1ad3d..27436a1ad3d 100644
--- a/compiler-rt/test/asan/TestCases/Posix/readv.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/readv.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/shared-lib-test.cc b/compiler-rt/test/asan/TestCases/Posix/shared-lib-test.cpp
index 6de6d9fdfe5..6f0a9f74a19 100644
--- a/compiler-rt/test/asan/TestCases/Posix/shared-lib-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/shared-lib-test.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[]) {
   // CHECK: {{.*ERROR: AddressSanitizer: global-buffer-overflow}}
   // CHECK: {{READ of size 4 at 0x.* thread T0}}
   // CHECK: {{    #0 0x.*}}
-  // CHECK: {{    #1 0x.* in main .*shared-lib-test.cc:}}[[@LINE-4]]
+  // CHECK: {{    #1 0x.* in main .*shared-lib-test.cpp:}}[[@LINE-4]]
   return 0;
 }
 #else  // SHARED_LIB
diff --git a/compiler-rt/test/asan/TestCases/Posix/stack-overflow.cc b/compiler-rt/test/asan/TestCases/Posix/stack-overflow.cpp
index d6b062ed3fb..d6b062ed3fb 100644
--- a/compiler-rt/test/asan/TestCases/Posix/stack-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/stack-overflow.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/stack-use-after-return.cc b/compiler-rt/test/asan/TestCases/Posix/stack-use-after-return.cpp
index 02588d708e2..bb7f8430938 100644
--- a/compiler-rt/test/asan/TestCases/Posix/stack-use-after-return.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/stack-use-after-return.cpp
@@ -56,11 +56,11 @@ void Func2(char *x) {
   fprintf(stderr, "2: %p\n", x);
   *x = 1;
   // CHECK: WRITE of size 1 {{.*}} thread T0
-  // CHECK:     #0{{.*}}Func2{{.*}}stack-use-after-return.cc:[[@LINE-2]]
+  // CHECK:     #0{{.*}}Func2{{.*}}stack-use-after-return.cpp:[[@LINE-2]]
   // CHECK: is located in stack of thread T0 at offset
   // CHECK: 'local'{{.*}} <== Memory access at offset {{16|32}} is inside this variable
   // THREAD: WRITE of size 1 {{.*}} thread T{{[1-9]}}
-  // THREAD:     #0{{.*}}Func2{{.*}}stack-use-after-return.cc:[[@LINE-6]]
+  // THREAD:     #0{{.*}}Func2{{.*}}stack-use-after-return.cpp:[[@LINE-6]]
   // THREAD: is located in stack of thread T{{[1-9]}} at offset
   // THREAD: 'local'{{.*}} <== Memory access at offset {{16|32}} is inside this variable
   // CHECK-20: T0: FakeStack created:{{.*}} stack_size_log: 20
diff --git a/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc b/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cpp
index 9c674ac57e4..9c674ac57e4 100644
--- a/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/strerror_r_test.cc b/compiler-rt/test/asan/TestCases/Posix/strerror_r_test.cpp
index e6df441770d..e6df441770d 100644
--- a/compiler-rt/test/asan/TestCases/Posix/strerror_r_test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/strerror_r_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test.cc b/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test.cpp
index 22bbf7c7ef1..46c9dceec8d 100644
--- a/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test.cpp
@@ -17,11 +17,11 @@ int main(int argc, char **argv) {
   char *copy = strndup(kString, 2);
   int x = copy[2 + argc];  // BOOM
   // CHECK: AddressSanitizer: heap-buffer-overflow
-  // CHECK: #0 {{.*}}main {{.*}}strndup_oob_test.cc:[[@LINE-2]]
+  // CHECK: #0 {{.*}}main {{.*}}strndup_oob_test.cpp:[[@LINE-2]]
   // CHECK-LABEL: allocated by thread T{{.*}} here:
   // CHECK: #{{[01]}} {{.*}}strndup
-  // CHECK: #{{.*}}main {{.*}}strndup_oob_test.cc:[[@LINE-6]]
+  // CHECK: #{{.*}}main {{.*}}strndup_oob_test.cpp:[[@LINE-6]]
   // CHECK-LABEL: SUMMARY
-  // CHECK: strndup_oob_test.cc:[[@LINE-7]]
+  // CHECK: strndup_oob_test.cpp:[[@LINE-7]]
   return x;
 }
diff --git a/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test2.cc b/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test2.cpp
index 8cc822d7cb3..774e7072090 100644
--- a/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test2.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/strndup_oob_test2.cpp
@@ -17,6 +17,6 @@ int main(int argc, char **argv) {
   char *copy = strndup(kChars, 3);

   copy = strndup(kChars, 10);

   // CHECK: AddressSanitizer: global-buffer-overflow

-  // CHECK: {{.*}}main {{.*}}.cc:[[@LINE-2]]

+  // CHECK: {{.*}}main {{.*}}.cpp:[[@LINE-2]]

   return *copy;

 }

diff --git a/compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc b/compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cpp
index 860f3459e5a..860f3459e5a 100644
--- a/compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/tsd_dtor_leak.cpp
diff --git a/compiler-rt/test/asan/TestCases/Posix/wait.cc b/compiler-rt/test/asan/TestCases/Posix/wait.cpp
index 85e819369c0..7ca1c57a2ed 100644
--- a/compiler-rt/test/asan/TestCases/Posix/wait.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/wait.cpp
@@ -24,7 +24,7 @@ int main(int argc, char **argv) {
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}
     // CHECK: {{in .*wait}}
-    // CHECK: {{in main .*wait.cc:}}
+    // CHECK: {{in main .*wait.cpp:}}
     // CHECK: is located in stack of thread T0 at offset
     // CHECK: {{in main}}
     return res == -1 ? 1 : 0;
diff --git a/compiler-rt/test/asan/TestCases/Posix/wait3.cc b/compiler-rt/test/asan/TestCases/Posix/wait3.cpp
index 081a73e16f0..7fb4d651225 100644
--- a/compiler-rt/test/asan/TestCases/Posix/wait3.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/wait3.cpp
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}
     // CHECK: {{in .*wait}}
-    // CHECK: {{in main .*wait3.cc:}}
+    // CHECK: {{in main .*wait3.cpp:}}
     // CHECK: is located in stack of thread T0 at offset
     // CHECK: {{in main}}
     return res == -1 ? 1 : 0;
diff --git a/compiler-rt/test/asan/TestCases/Posix/wait4.cc b/compiler-rt/test/asan/TestCases/Posix/wait4.cpp
index aee5570b82e..1e574d99fe0 100644
--- a/compiler-rt/test/asan/TestCases/Posix/wait4.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/wait4.cpp
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}
     // CHECK: {{in .*wait}}
-    // CHECK: {{in main .*wait4.cc:}}
+    // CHECK: {{in main .*wait4.cpp:}}
     // CHECK: is located in stack of thread T0 at offset
     // CHECK: {{in main}}
     return res == -1 ? 1 : 0;
diff --git a/compiler-rt/test/asan/TestCases/Posix/waitid.cc b/compiler-rt/test/asan/TestCases/Posix/waitid.cpp
index 20fb0c69438..5e635c7777e 100644
--- a/compiler-rt/test/asan/TestCases/Posix/waitid.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/waitid.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}
     // CHECK: {{in .*waitid}}
-    // CHECK: {{in main .*waitid.cc:}}
+    // CHECK: {{in main .*waitid.cpp:}}
     // CHECK: is located in stack of thread T0 at offset
     // CHECK: {{in main}}
     return res != -1;
diff --git a/compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cc b/compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cpp
index 48bb2210106..48bb2210106 100644
--- a/compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cc b/compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cpp
index 2738b4e7bd8..2738b4e7bd8 100644
--- a/compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/beginthreadex.cc b/compiler-rt/test/asan/TestCases/Windows/beginthreadex.cpp
index 05d72a53910..05d72a53910 100644
--- a/compiler-rt/test/asan/TestCases/Windows/beginthreadex.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/beginthreadex.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/bind_io_completion_callback.cc b/compiler-rt/test/asan/TestCases/Windows/bind_io_completion_callback.cpp
index ef7e45867ed..ef7e45867ed 100644
--- a/compiler-rt/test/asan/TestCases/Windows/bind_io_completion_callback.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/bind_io_completion_callback.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/bitfield.cc b/compiler-rt/test/asan/TestCases/Windows/bitfield.cpp
index 174c92dbe44..174c92dbe44 100644
--- a/compiler-rt/test/asan/TestCases/Windows/bitfield.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/bitfield.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cpp
index 6462d31bfae..9095b805ea3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cpp
@@ -14,7 +14,7 @@ void make_access(S *s) {
   s->bf2 = 2;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: READ of size {{[124]}} at [[ADDR]]
-// CHECK:   {{#0 .* make_access.*bitfield_uaf.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* make_access.*bitfield_uaf.cpp}}:[[@LINE-3]]
 // CHECK:   {{#1 .* main}}
 }
 
@@ -24,10 +24,10 @@ int main(void) {
 // CHECK: [[ADDR]] is located 0 bytes inside of 4-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // CHECK:   {{#0 .* free }}
-// CHECK:   {{#1 .* main .*bitfield_uaf.cc}}:[[@LINE-4]]
+// CHECK:   {{#1 .* main .*bitfield_uaf.cpp}}:[[@LINE-4]]
 // CHECK-LABEL: previously allocated by thread T0 here:
 // CHECK:   {{#0 .* malloc }}
-// CHECK:   {{#1 .* main .*bitfield_uaf.cc}}:[[@LINE-8]]
+// CHECK:   {{#1 .* main .*bitfield_uaf.cpp}}:[[@LINE-8]]
   make_access(s);
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cpp
index d48d59f3a67..309f4d36f64 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*calloc_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*calloc_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 4 bytes to the left of 168-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* calloc }}
-// CHECK-NEXT: {{#1 .* main .*calloc_left_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*calloc_left_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cpp
index 4d114fd83f9..723da55356d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[42] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*calloc_right_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*calloc_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 168-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* calloc }}
-// CHECK-NEXT: {{#1 .* main .*calloc_right_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*calloc_right_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cpp
index bd14bb0797e..54577f014c5 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cpp
@@ -9,12 +9,12 @@ int main() {
   buffer[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*calloc_uaf.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*calloc_uaf.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 168-byte region
 // CHECK: freed by thread T0 here:
 // CHECK-NEXT: {{#0 .* free }}
-// CHECK-NEXT: {{#1 .* main .*calloc_uaf.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*calloc_uaf.cpp}}:[[@LINE-8]]
 // CHECK: previously allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* calloc }}
-// CHECK-NEXT: {{#1 .* main .*calloc_uaf.cc}}:[[@LINE-12]]
+// CHECK-NEXT: {{#1 .* main .*calloc_uaf.cpp}}:[[@LINE-12]]
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc b/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cpp
index 1469e1c30ae..1469e1c30ae 100644
--- a/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/coverage-basic.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cc b/compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cpp
index 5cba9a76c38..f2bfaad28a1 100644
--- a/compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cpp
@@ -2,7 +2,7 @@
 // __local_stdio_printf_options function isn't instrumented for coverage.
 
 // RUN: rm -rf %t && mkdir %t && cd %t
-// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -Od %p/dll_host.cc -Fet.exe
+// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -Od %p/dll_host.cpp -Fet.exe
 // RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -LD -Od %s -Fet.dll
 // RUN: %run ./t.exe t.dll 2>&1 | FileCheck %s
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/crash_read_write.cc b/compiler-rt/test/asan/TestCases/Windows/crash_read_write.cpp
index 74200cca152..74200cca152 100644
--- a/compiler-rt/test/asan/TestCases/Windows/crash_read_write.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/crash_read_write.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/crt_initializers.cc b/compiler-rt/test/asan/TestCases/Windows/crt_initializers.cpp
index f33c16362a2..f33c16362a2 100644
--- a/compiler-rt/test/asan/TestCases/Windows/crt_initializers.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/crt_initializers.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/delay_dbghelp.cc b/compiler-rt/test/asan/TestCases/Windows/delay_dbghelp.cpp
index 81cd2d389c3..81cd2d389c3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/delay_dbghelp.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/delay_dbghelp.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/demangled_names.cc b/compiler-rt/test/asan/TestCases/Windows/demangled_names.cpp
index 6d3019ef054..1e655b43d7a 100644
--- a/compiler-rt/test/asan/TestCases/Windows/demangled_names.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/demangled_names.cpp
@@ -43,8 +43,8 @@ int main() {
   free(buffer);
   A<char*> a(buffer);
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
-// CHECK: foo::bar<42>{{.*}}demangled_names.cc
-// CHECK: foo::spam{{.*}}demangled_names.cc
-// CHECK: baz<char *,1>{{.*}}demangled_names.cc
-// CHECK: A<char *>::~A<char *>{{.*}}demangled_names.cc
+// CHECK: foo::bar<42>{{.*}}demangled_names.cpp
+// CHECK: foo::spam{{.*}}demangled_names.cpp
+// CHECK: baz<char *,1>{{.*}}demangled_names.cpp
+// CHECK: A<char *>::~A<char *>{{.*}}demangled_names.cpp
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cc b/compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cpp
index 8ef428462f3..a6a1a3bb91b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll | FileCheck %s
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cc b/compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cpp
index 35b47c43338..9e0543cb66d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll | FileCheck %s
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_and_lib.cc b/compiler-rt/test/asan/TestCases/Windows/dll_and_lib.cpp
index bddaa32df73..bddaa32df73 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_and_lib.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_and_lib.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_cerr.cc b/compiler-rt/test/asan/TestCases/Windows/dll_cerr.cpp
index 792c05f70fd..1e096788819 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_cerr.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_cerr.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll 2>&1 | FileCheck %s
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_control_c.cc b/compiler-rt/test/asan/TestCases/Windows/dll_control_c.cpp
index 40d010d07e2..e30276325db 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_control_c.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_control_c.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -O2 %s -Fe%t.dll
 // RUNX: %run %t %t.dll 2>&1 | FileCheck %s
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c b/compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
index 845095d1d7c..e5716be4e42 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 //
 // RUN: %clang_cl_asan /Gw -LD -Od %s -Fe%t.dll
 // RUN: %env_asan_opts=report_globals=2 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=NOSTRIP
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_heap_allocation.cc b/compiler-rt/test/asan/TestCases/Windows/dll_heap_allocation.cpp
index b4df9d4f222..b4df9d4f222 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_heap_allocation.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_heap_allocation.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_host.cc b/compiler-rt/test/asan/TestCases/Windows/dll_host.cpp
index 30678e3eb6e..30678e3eb6e 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_host.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_host.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cpp
index 7891a2afe0c..093134fac59 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -19,9 +19,9 @@ int test_function() {
 // CHECK: READ of size 7 at [[ADDR]] thread T0
 // CHECK-NEXT:  __asan_wrap_memchr
 // CHECK-NEXT:  memchr
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memchr.cc:[[@LINE-5]]
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memchr.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memchr.cc
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memchr.cpp
 // CHECK: 'buff'{{.*}} <== Memory access at offset {{.*}} overflows this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cpp
index 2c284e76131..7b4fbb63bb3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -24,9 +24,9 @@ int test_function() {
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
 // CHECK-NEXT:  __asan_{{.*}}memcpy
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy.cc:[[@LINE-4]]
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy.cpp:[[@LINE-4]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy.cc
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy.cpp
 // CHECK: 'buff2'{{.*}} <== Memory access at offset {{.*}} overflows this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
index 49fde377fe7..f2b8cdb5f5d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -26,9 +26,9 @@ int test_function() {
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
 // CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
 // CHECK-NEXT:  call_memcpy
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cc:[[@LINE-5]]
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cc
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memcpy_indirect.cpp
 // CHECK: 'buff2'{{.*}} <== Memory access at offset {{.*}} overflows this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cpp
index ccf2e218360..789a1993521 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -24,9 +24,9 @@ int test_function() {
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
 // CHECK-NEXT:  __asan_memset
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memset.cc:[[@LINE-4]]
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memset.cpp:[[@LINE-4]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT:  test_function {{.*}}dll_intercept_memset.cc
+// CHECK-NEXT:  test_function {{.*}}dll_intercept_memset.cpp
 // CHECK: 'buff'{{.*}} <== Memory access at offset {{.*}} overflows this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cpp
index 2e10c504ae3..e15dec137dc 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -20,9 +20,9 @@ int test_function() {
 // FIXME: Should be READ of size 1, see issue 155.
 // CHECK: READ of size {{[0-9]+}} at [[ADDR]] thread T0
 // CHECK-NEXT: {{#0 .*}}strlen
-// CHECK-NEXT: {{#1 .* test_function .*}}dll_intercept_strlen.cc:[[@LINE-5]]
+// CHECK-NEXT: {{#1 .* test_function .*}}dll_intercept_strlen.cpp:[[@LINE-5]]
 //
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT: test_function {{.*}}dll_intercept_strlen.cc:
+// CHECK-NEXT: test_function {{.*}}dll_intercept_strlen.cpp:
   return len > 42;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_large_function.cc b/compiler-rt/test/asan/TestCases/Windows/dll_large_function.cpp
index 039d01f84ba..039d01f84ba 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_large_function.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_large_function.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cpp
index 4ed50e9c6b5..bab85771480 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -9,14 +9,14 @@ int test_function() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: test_function {{.*}}dll_malloc_left_oob.cc:[[@LINE-3]]
-// CHECK-NEXT: main {{.*}}dll_host.cc
+// CHECK-NEXT: test_function {{.*}}dll_malloc_left_oob.cpp:[[@LINE-3]]
+// CHECK-NEXT: main {{.*}}dll_host.cpp
 //
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK-LABEL: allocated by thread T0 here:
 // CHECK-NEXT:   malloc
-// CHECK-NEXT:   test_function {{.*}}dll_malloc_left_oob.cc:[[@LINE-10]]
-// CHECK-NEXT:   main {{.*}}dll_host.cc
+// CHECK-NEXT:   test_function {{.*}}dll_malloc_left_oob.cpp:[[@LINE-10]]
+// CHECK-NEXT:   main {{.*}}dll_host.cpp
 // CHECK-LABEL: SUMMARY
   free(buffer);
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cpp
index adaded1df4b..290541f6d15 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -11,18 +11,18 @@ int test_function() {
   buffer[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cc:[[@LINE-3]]
+// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cpp:[[@LINE-3]]
 // CHECK-NEXT:  main {{.*}}dll_host
 //
 // CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // CHECK-NEXT:  free
-// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cc:[[@LINE-10]]
+// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cpp:[[@LINE-10]]
 // CHECK-NEXT:  main {{.*}}dll_host
 //
 // CHECK-LABEL: previously allocated by thread T0 here:
 // CHECK-NEXT:  malloc
-// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cc:[[@LINE-16]]
+// CHECK-NEXT:  test_function {{.*}}dll_malloc_uaf.cpp:[[@LINE-16]]
 // CHECK-NEXT:  main {{.*}}dll_host
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc b/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cpp
index dfe51aadbb7..8b8e4d14994 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -11,12 +11,12 @@ void noreturn_f() {
   _exit(1);
 // CHECK: AddressSanitizer: stack-buffer-underflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT:  noreturn_f{{.*}}dll_noreturn.cc:[[@LINE-4]]
-// CHECK-NEXT:  test_function{{.*}}dll_noreturn.cc
-// CHECK-NEXT:  main{{.*}}dll_host.cc
+// CHECK-NEXT:  noreturn_f{{.*}}dll_noreturn.cpp:[[@LINE-4]]
+// CHECK-NEXT:  test_function{{.*}}dll_noreturn.cpp
+// CHECK-NEXT:  main{{.*}}dll_host.cpp
 //
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT:  noreturn_f{{.*}}dll_noreturn.cc
+// CHECK-NEXT:  noreturn_f{{.*}}dll_noreturn.cpp
 // CHECK: 'buffer'{{.*}} <== Memory access at offset [[OFFSET]] underflows this variable
 // CHECK-LABEL: SUMMARY
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cc b/compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cpp
index 5b3d97705c6..0c826a0f384 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -12,7 +12,7 @@ static void NullDeref(int *ptr) {
 extern "C" __declspec(dllexport)
 int test_function() {
   NullDeref((int*)0);
-  // CHECK: {{    #1 0x.* in test_function .*\dll_null_deref.cc:}}[[@LINE-1]]
+  // CHECK: {{    #1 0x.* in test_function .*\dll_null_deref.cpp:}}[[@LINE-1]]
   // CHECK: AddressSanitizer can not provide additional info.
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cpp
index 3983a2651bc..95064d7aeb0 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -8,8 +8,8 @@ int test_function() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: test_function {{.*}}dll_operator_array_new_left_oob.cc:[[@LINE-3]]
-// CHECK-NEXT: main {{.*}}dll_host.cc
+// CHECK-NEXT: test_function {{.*}}dll_operator_array_new_left_oob.cpp:[[@LINE-3]]
+// CHECK-NEXT: main {{.*}}dll_host.cpp
 //
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK-LABEL: allocated by thread T0 here:
@@ -17,8 +17,8 @@ int test_function() {
 // operator new/delete in DLLs when using -MT CRT.
 // FIXME: The 'operator new' frame should have [].
 // CHECK:        operator new
-// CHECK-NEXT:   test_function {{.*}}dll_operator_array_new_left_oob.cc:[[@LINE-13]]
-// CHECK-NEXT:   main {{.*}}dll_host.cc
+// CHECK-NEXT:   test_function {{.*}}dll_operator_array_new_left_oob.cpp:[[@LINE-13]]
+// CHECK-NEXT:   main {{.*}}dll_host.cpp
 // CHECK-LABEL: SUMMARY
   delete [] buffer;
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cpp
index 4b0e45d8548..a08524f7b5b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -13,8 +13,8 @@ int test_function() {
   buffer[-(1 + sizeof(void*) / 4)].x = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT: test_function {{.*}}dll_operator_array_new_with_dtor_left_oob.cc:[[@LINE-3]]
-// CHECK-NEXT: main {{.*}}dll_host.cc
+// CHECK-NEXT: test_function {{.*}}dll_operator_array_new_with_dtor_left_oob.cpp:[[@LINE-3]]
+// CHECK-NEXT: main {{.*}}dll_host.cpp
 //
 // FIXME: Currently it says "4 bytes ... left of 172-byte region",
 //        should be "8 bytes ... left of 168-byte region", see
@@ -25,8 +25,8 @@ int test_function() {
 // FIXME: The operator new frame should have [].
 // CHECK-LABEL: allocated by thread T0 here:
 // CHECK:        operator new
-// CHECK-NEXT:   test_function {{.*}}dll_operator_array_new_with_dtor_left_oob.cc:[[@LINE-16]]
-// CHECK-NEXT:   main {{.*}}dll_host.cc
+// CHECK-NEXT:   test_function {{.*}}dll_operator_array_new_with_dtor_left_oob.cpp:[[@LINE-16]]
+// CHECK-NEXT:   main {{.*}}dll_host.cpp
 // CHECK-LABEL: SUMMARY
   delete [] buffer;
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc b/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cpp
index bbc2730e129..6a23da7640c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -24,12 +24,12 @@ int test_function() {
   should_crash(&buffer[96]);
 // CHECK: AddressSanitizer: use-after-poison on address [[ADDR:0x[0-9a-f]+]]
 // CHECK-NEXT: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: should_crash{{.*}}\dll_poison_unpoison.cc
-// CHECK-NEXT: test_function{{.*}}\dll_poison_unpoison.cc:[[@LINE-4]]
+// CHECK-NEXT: should_crash{{.*}}\dll_poison_unpoison.cpp
+// CHECK-NEXT: test_function{{.*}}\dll_poison_unpoison.cpp:[[@LINE-4]]
 // CHECK-NEXT: main
 //
 // CHECK: [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT: test_function{{.*}}\dll_poison_unpoison.cc
+// CHECK-NEXT: test_function{{.*}}\dll_poison_unpoison.cpp
 // CHECK: 'buffer'{{.*}} <== Memory access at offset [[OFFSET]] is inside this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cc b/compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cpp
index 0a8e3d8cdc3..0a8e3d8cdc3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_seh.cc b/compiler-rt/test/asan/TestCases/Windows/dll_seh.cpp
index 033892e744e..3651463c5e6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_seh.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 //
 // Check both -GS and -GS- builds:
 // RUN: %clang_cl_asan -GS  -LD -Od %s -Fe%t.dll
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc b/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cpp
index 44313195bc1..3f36fccb0a7 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %env_asan_opts=detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -17,11 +17,11 @@ int test_function() {
   *x = 42;
 // CHECK: AddressSanitizer: stack-use-after-return
 // CHECK: WRITE of size 1 at [[ADDR:.*]] thread T0
-// CHECK-NEXT:  test_function{{.*}}dll_stack_use_after_return.cc:[[@LINE-3]]
+// CHECK-NEXT:  test_function{{.*}}dll_stack_use_after_return.cpp:[[@LINE-3]]
 // CHECK-NEXT:  main
 //
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT: #0 {{.*}} foo{{.*}}dll_stack_use_after_return.cc
+// CHECK-NEXT: #0 {{.*}} foo{{.*}}dll_stack_use_after_return.cpp
 // CHECK: 'stack_buffer'{{.*}} <== Memory access at offset [[OFFSET]] is inside this variable
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cpp
index 8959846b13e..c25da9008b9 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cpp -Fe%t
 // RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
@@ -11,10 +11,10 @@ DWORD WINAPI thread_proc(void *context) {
   stack_buffer[subscript] = 42;
 // CHECK: AddressSanitizer: stack-buffer-underflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T1
-// CHECK-NEXT:  thread_proc{{.*}}dll_thread_stack_array_left_oob.cc:[[@LINE-3]]
+// CHECK-NEXT:  thread_proc{{.*}}dll_thread_stack_array_left_oob.cpp:[[@LINE-3]]
 //
 // CHECK: Address [[ADDR]] is located in stack of thread T1 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT:  thread_proc{{.*}}dll_thread_stack_array_left_oob.cc
+// CHECK-NEXT:  thread_proc{{.*}}dll_thread_stack_array_left_oob.cpp
 //
 // CHECK: 'stack_buffer'{{.*}} <== Memory access at offset [[OFFSET]] underflows this variable
 
@@ -25,8 +25,8 @@ extern "C" __declspec(dllexport)
 int test_function() {
   HANDLE thr = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL);
 // CHECK-LABEL: Thread T1 created by T0 here:
-// CHECK:         test_function{{.*}}dll_thread_stack_array_left_oob.cc:[[@LINE-2]]
-// CHECK-NEXT:    main{{.*}}dll_host.cc
+// CHECK:         test_function{{.*}}dll_thread_stack_array_left_oob.cpp:[[@LINE-2]]
+// CHECK-NEXT:    main{{.*}}dll_host.cpp
 // CHECK-LABEL: SUMMARY
   if (thr == 0)
     return 1;
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_unload.cc b/compiler-rt/test/asan/TestCases/Windows/dll_unload.cpp
index 055567a0f54..055567a0f54 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_unload.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_unload.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/double_free.cc b/compiler-rt/test/asan/TestCases/Windows/double_free.cpp
index 7a1dd3b5bd5..68437462a4c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/double_free.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/double_free.cpp
@@ -9,13 +9,13 @@ int main() {
   free(x);
 // CHECK: AddressSanitizer: attempting double-free on [[ADDR:0x[0-9a-f]+]]
 // CHECK-NEXT: {{#0 .* free }}
-// CHECK-NEXT: {{#1 .* main .*double_free.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#1 .* main .*double_free.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 168-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // CHECK-NEXT: {{#0 .* free }}
-// CHECK-NEXT: {{#1 .* main .*double_free.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*double_free.cpp}}:[[@LINE-8]]
 // CHECK-LABEL: previously allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* malloc }}
-// CHECK-NEXT: {{#1 .* main .*double_free.cc}}:[[@LINE-12]]
+// CHECK-NEXT: {{#1 .* main .*double_free.cpp}}:[[@LINE-12]]
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc b/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cpp
index 99a8fc4725e..168e531a82b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cpp
@@ -10,16 +10,16 @@ int main() {
 // CHECK: AddressSanitizer: attempting double-free on [[ADDR:0x[0-9a-f]+]]
 // FIXME: The 'operator delete' frame should have [].
 // CHECK-NEXT: {{#0 .* operator delete}}
-// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cc}}:[[@LINE-4]]
+// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cpp}}:[[@LINE-4]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 168-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // FIXME: The 'operator delete' frame should have [].
 // CHECK-NEXT: {{#0 .* operator delete}}
-// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cc}}:[[@LINE-10]]
+// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cpp}}:[[@LINE-10]]
 // CHECK-LABEL: previously allocated by thread T0 here:
 // FIXME: The 'operator new' frame should have [].
 // CHECK-NEXT: {{#0 .* operator new}}
-// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cc}}:[[@LINE-15]]
+// CHECK-NEXT: {{#1 .* main .*double_operator_delete.cpp}}:[[@LINE-15]]
   return 0;
 }
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/free_hook_realloc.cc b/compiler-rt/test/asan/TestCases/Windows/free_hook_realloc.cpp
index 11e8c9975cf..11e8c9975cf 100644
--- a/compiler-rt/test/asan/TestCases/Windows/free_hook_realloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/free_hook_realloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/fuse-lld-globals.cc b/compiler-rt/test/asan/TestCases/Windows/fuse-lld-globals.cpp
index 4148d562fb4..cb068431e12 100644
--- a/compiler-rt/test/asan/TestCases/Windows/fuse-lld-globals.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/fuse-lld-globals.cpp
@@ -10,7 +10,7 @@ int main(int argc, char **argv) {
   memset(ZZZ, 0, 10);
   int res = YYY[argc * 10];  // BOOOM
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*fuse-lld-globals.cc:}}[[@LINE-2]]
+  // CHECK: {{    #0 0x.* in main .*fuse-lld-globals.cpp:}}[[@LINE-2]]
   // CHECK: {{0x.* is located 0 bytes to the right of global variable}}
   // CHECK:   {{.*YYY.* of size 10}}
   res += XXX[argc] + ZZZ[argc];
diff --git a/compiler-rt/test/asan/TestCases/Windows/fuse-lld.cc b/compiler-rt/test/asan/TestCases/Windows/fuse-lld.cpp
index 2aee0385d15..5fa5945df4d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/fuse-lld.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/fuse-lld.cpp
@@ -13,7 +13,7 @@ int main() {
   return x[5];
   // CHECK: heap-use-after-free
   // CHECK: free
-  // CHECK: main{{.*}}fuse-lld.cc:[[@LINE-4]]:3
+  // CHECK: main{{.*}}fuse-lld.cpp:[[@LINE-4]]:3
   // CHECK: malloc
-  // CHECK: main{{.*}}fuse-lld.cc:[[@LINE-7]]:20
+  // CHECK: main{{.*}}fuse-lld.cpp:[[@LINE-7]]:20
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/global_const_string.cc b/compiler-rt/test/asan/TestCases/Windows/global_const_string.cpp
index 546419dad18..546419dad18 100644
--- a/compiler-rt/test/asan/TestCases/Windows/global_const_string.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/global_const_string.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc b/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cpp
index f31190f7d79..241d14f42a2 100644
--- a/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cpp
@@ -12,8 +12,8 @@ int main(void) {
 // CHECK-NOT: Boo
 // CHECK: AddressSanitizer: global-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: READ of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT:   {{#0 .* main .*global_const_string_oob.cc:}}[[@LINE-5]]
-// CHECK: [[ADDR]] is located 5 bytes to the right of global variable [[STR:.*]] defined in {{'.*global_const_string_oob.cc:7:.*' .*}} of size 11
+// CHECK-NEXT:   {{#0 .* main .*global_const_string_oob.cpp:}}[[@LINE-5]]
+// CHECK: [[ADDR]] is located 5 bytes to the right of global variable [[STR:.*]] defined in {{'.*global_const_string_oob.cpp:7:.*' .*}} of size 11
 // CHECK:   [[STR]] is ascii string 'foobarspam'
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc.cpp
index cb07b8fb0f2..cb07b8fb0f2 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_double_free.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_double_free.cpp
index 496289ae128..496289ae128 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_double_free.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_double_free.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_unload_realloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_unload_realloc_uaf.cpp
index 79b30f4a9eb..79b30f4a9eb 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_unload_realloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_dll_unload_realloc_uaf.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cpp
index 3394a9233b6..3394a9233b6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cpp
index e040fd58199..e040fd58199 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cpp
index 3a6ce7854eb..3a6ce7854eb 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_rtl_transfer.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_rtl_transfer.cpp
index a36e5947037..a36e5947037 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_rtl_transfer.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_rtl_transfer.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cpp
index a2ee68621a9..a2ee68621a9 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_transfer.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_transfer.cpp
index 497d36b4178..497d36b4178 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_transfer.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_transfer.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cpp
index e0f1f865741..e0f1f865741 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heapalloc_zero_size.cc b/compiler-rt/test/asan/TestCases/Windows/heapalloc_zero_size.cpp
index 40396ed5f0d..40396ed5f0d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heapalloc_zero_size.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heapalloc_zero_size.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heaprealloc.cc b/compiler-rt/test/asan/TestCases/Windows/heaprealloc.cpp
index add644c05e7..add644c05e7 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heaprealloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heaprealloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heaprealloc_alloc_zero.cc b/compiler-rt/test/asan/TestCases/Windows/heaprealloc_alloc_zero.cpp
index 7b1272ea5bc..7b1272ea5bc 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heaprealloc_alloc_zero.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heaprealloc_alloc_zero.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/heaprealloc_zero_size.cc b/compiler-rt/test/asan/TestCases/Windows/heaprealloc_zero_size.cpp
index 96bc9b90c44..96bc9b90c44 100644
--- a/compiler-rt/test/asan/TestCases/Windows/heaprealloc_zero_size.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/heaprealloc_zero_size.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/hello_world.cc b/compiler-rt/test/asan/TestCases/Windows/hello_world.cpp
index 0caeb35554c..0caeb35554c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/hello_world.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/hello_world.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
index 846c6d8b37d..db8de07bf22 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cpp
@@ -24,7 +24,7 @@ int main() {
 // CHECK: WRITE of size 6 at [[ADDR]] thread T0
 // CHECK-NEXT:  __asan_{{.*}}mem{{.*}}
 // CHECK-NEXT:  call_mem{{.*}}
-// CHECK-NEXT:  main {{.*}}intercept_memcpy.cc:[[@LINE-5]]
+// CHECK-NEXT:  main {{.*}}intercept_memcpy.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
 // CHECK-NEXT:   #0 {{.*}} main
 // CHECK: 'buff2'{{.*}} <== Memory access at offset {{.*}} overflows this variable
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp
index 2bef08d68ad..46a59ead60c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cpp
@@ -17,7 +17,7 @@ int main() {
   ptr[subscript] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*}}intercept_strdup.cc:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*}}intercept_strdup.cpp:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 1 bytes to the left of 6-byte region
 // CHECK: allocated by thread T0 here:
 //
@@ -27,6 +27,6 @@ int main() {
 //
 // The local call to _strdup above may be the second or third frame depending
 // on whether we're using the dynamic config.
-// CHECK:   #{{[12]}} {{.*}} in main {{.*}}intercept_strdup.cc:[[@LINE-21]]
+// CHECK:   #{{[12]}} {{.*}} in main {{.*}}intercept_strdup.cpp:[[@LINE-21]]
   free(ptr);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cpp
index 217aab2decf..0cedf9f2214 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cpp
@@ -19,9 +19,9 @@ int main() {
 // FIXME: Should be READ of size 1, see issue 155.
 // CHECK: READ of size {{[0-9]+}} at [[ADDR]] thread T0
 // CHECK:      strlen 
-// CHECK-NEXT: main {{.*}}intercept_strlen.cc:[[@LINE-5]]
+// CHECK-NEXT: main {{.*}}intercept_strlen.cpp:[[@LINE-5]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset {{.*}} in frame
-// CHECK-NEXT: main {{.*}}intercept_strlen.cc
+// CHECK-NEXT: main {{.*}}intercept_strlen.cpp
 // CHECK: 'str'{{.*}} <== Memory access at offset {{.*}} overflows this variable
   return len < 6;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp
index 1738b87e80d..1738b87e80d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cc b/compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cpp
index 46f452a3252..46f452a3252 100644
--- a/compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/longjmp.cc b/compiler-rt/test/asan/TestCases/Windows/longjmp.cpp
index 443933e8ab6..443933e8ab6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/longjmp.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/longjmp.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cpp
index 131dff2effc..cf8a1b7086c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*malloc_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*malloc_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* malloc }}
-// CHECK-NEXT: {{#1 .* main .*malloc_left_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*malloc_left_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cpp
index 4fef3065c69..acb55a3a2c4 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[42] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*malloc_right_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*malloc_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 42-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* malloc }}
-// CHECK-NEXT: {{#1 .* main .*malloc_right_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*malloc_right_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cpp
index 5385a5c3c25..8cecc680e49 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cpp
@@ -9,12 +9,12 @@ int main() {
   buffer[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*malloc_uaf.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*malloc_uaf.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
 // CHECK: freed by thread T0 here:
 // CHECK-NEXT: {{#0 .* free }}
-// CHECK-NEXT: {{#1 .* main .*malloc_uaf.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*malloc_uaf.cpp}}:[[@LINE-8]]
 // CHECK: previously allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* malloc }}
-// CHECK-NEXT: {{#1 .* main .*malloc_uaf.cc}}:[[@LINE-12]]
+// CHECK-NEXT: {{#1 .* main .*malloc_uaf.cpp}}:[[@LINE-12]]
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/null_deref.cc b/compiler-rt/test/asan/TestCases/Windows/null_deref.cpp
index 9515602ce89..6582bac9e69 100644
--- a/compiler-rt/test/asan/TestCases/Windows/null_deref.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/null_deref.cpp
@@ -10,6 +10,6 @@ static void NullDeref(int *ptr) {
 }
 int main() {
   NullDeref((int*)0);
-  // CHECK: {{    #1 0x.* in main.*null_deref.cc:}}[[@LINE-1]]:3
+  // CHECK: {{    #1 0x.* in main.*null_deref.cpp:}}[[@LINE-1]]:3
   // CHECK: AddressSanitizer can not provide additional info.
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cc b/compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cpp
index 281dffa4f79..09a572e58af 100644
--- a/compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cpp
@@ -31,7 +31,7 @@ static void NullDeref(int *ptr) {
 
 __declspec(dllexport) void foo2() {
   NullDeref((int*)0);
-  // CHECK: {{    #1 0x.* in foo2.*null_deref_multiple_dlls.cc:}}[[@LINE-1]]
+  // CHECK: {{    #1 0x.* in foo2.*null_deref_multiple_dlls.cpp:}}[[@LINE-1]]
   // CHECK: AddressSanitizer can not provide additional info.
 }
 #else
diff --git a/compiler-rt/test/asan/TestCases/Windows/oom.cc b/compiler-rt/test/asan/TestCases/Windows/oom.cpp
index bf19aa09cad..bf19aa09cad 100644
--- a/compiler-rt/test/asan/TestCases/Windows/oom.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/oom.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cpp
index fec8e15b786..a1abd7e1ea7 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cpp
@@ -6,12 +6,12 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*operator_array_new_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*operator_array_new_left_oob.cpp}}:[[@LINE-3]]
 //
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK-LABEL: allocated by thread T0 here:
 // FIXME: The 'operator new' frame should have [].
 // CHECK-NEXT: {{#0 .* operator new}}
-// CHECK-NEXT: {{#1 .* main .*operator_array_new_left_oob.cc}}:[[@LINE-10]]
+// CHECK-NEXT: {{#1 .* main .*operator_array_new_left_oob.cpp}}:[[@LINE-10]]
   delete [] buffer;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cpp
index 51c910a2f66..05395c0bfb3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cpp
@@ -8,11 +8,11 @@ int main() {
   buffer[42] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*operator_array_new_right_oob.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*operator_array_new_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 42-byte region
 // CHECK: allocated by thread T0 here:
 // FIXME: The 'operator new' frame should have [].
 // CHECK:   {{#0 .* operator new}}
-// CHECK:   {{#1 .* main .*operator_array_new_right_oob.cc}}:[[@LINE-9]]
+// CHECK:   {{#1 .* main .*operator_array_new_right_oob.cpp}}:[[@LINE-9]]
   delete [] buffer;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cpp
index e6bc1ac1c99..552ca9d8717 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cpp
@@ -9,16 +9,16 @@ int main() {
   buffer[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*operator_array_new_uaf.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*operator_array_new_uaf.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // FIXME: The 'operator delete' frame should have [].
 // CHECK:   {{#0 .* operator delete}}
-// CHECK:   {{#1 .* main .*operator_array_new_uaf.cc}}:[[@LINE-9]]
+// CHECK:   {{#1 .* main .*operator_array_new_uaf.cpp}}:[[@LINE-9]]
 // CHECK-LABEL: previously allocated by thread T0 here:
 // FIXME: The 'operator new' frame should have [].
 // CHECK:   {{#0 .* operator new}}
-// CHECK:   {{#1 .* main .*operator_array_new_uaf.cc}}:[[@LINE-14]]
+// CHECK:   {{#1 .* main .*operator_array_new_uaf.cpp}}:[[@LINE-14]]
   return 0;
 }
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cpp
index e91d05ea78c..0af00fb7c6d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cpp
@@ -11,7 +11,7 @@ int main() {
   buffer[-(1 + sizeof(void*) / 4)].x = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*operator_array_new_with_dtor_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*operator_array_new_with_dtor_left_oob.cpp}}:[[@LINE-3]]
 //
 // FIXME: Currently it says "4 bytes ... left of 172-byte region",
 //        should be "8 bytes ... left of 168-byte region", see
@@ -20,6 +20,6 @@ int main() {
 // CHECK-LABEL: allocated by thread T0 here:
 // FIXME: The 'operator new' frame should have [].
 // CHECK-NEXT: {{#0 .* operator new}}
-// CHECK-NEXT: {{#1 .* main .*operator_array_new_with_dtor_left_oob.cc}}:[[@LINE-13]]
+// CHECK-NEXT: {{#1 .* main .*operator_array_new_with_dtor_left_oob.cpp}}:[[@LINE-13]]
   delete [] buffer;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc b/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cpp
index d82bf588e2a..d8891859fb5 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cpp
@@ -8,5 +8,5 @@ int main() {
   delete (x + 1);
 // CHECK: AddressSanitizer: attempting free on address which was not malloc()-ed
 // CHECK:   {{#0 0x.* operator delete}}
-// CHECK:   {{#1 .* main .*operator_delete_wrong_argument.cc}}:[[@LINE-3]]
+// CHECK:   {{#1 .* main .*operator_delete_wrong_argument.cpp}}:[[@LINE-3]]
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cpp
index 2a0fb70e485..404b6a2842f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*operator_new_left_oob.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*operator_new_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 1 bytes to the left of 1-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK:   {{#0 .* operator new}}
-// CHECK:   {{#1 .* main .*operator_new_left_oob.cc}}:[[@LINE-8]]
+// CHECK:   {{#1 .* main .*operator_new_left_oob.cpp}}:[[@LINE-8]]
   delete buffer;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cpp
index 9ff08d33c10..113266bbba8 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*operator_new_right_oob.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*operator_new_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 1-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK:   {{#0 .* operator new}}
-// CHECK:   {{#1 .* main .*operator_new_right_oob.cc}}:[[@LINE-8]]
+// CHECK:   {{#1 .* main .*operator_new_right_oob.cpp}}:[[@LINE-8]]
   delete buffer;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cpp
index e1453727d47..fe8fc9022a6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cpp
@@ -9,14 +9,14 @@ int main() {
   *buffer = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK:   {{#0 .* main .*operator_new_uaf.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* main .*operator_new_uaf.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 1-byte region
 // CHECK-LABEL: freed by thread T0 here:
 // CHECK:   {{#0 .* operator delete}}
-// CHECK:   {{#1 .* main .*operator_new_uaf.cc}}:[[@LINE-8]]
+// CHECK:   {{#1 .* main .*operator_new_uaf.cpp}}:[[@LINE-8]]
 // CHECK-LABEL: previously allocated by thread T0 here:
 // CHECK:   {{#0 .* operator new}}
-// CHECK:   {{#1 .* main .*operator_new_uaf.cc}}:[[@LINE-12]]
+// CHECK:   {{#1 .* main .*operator_new_uaf.cpp}}:[[@LINE-12]]
   return 0;
 }
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item.cc b/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item.cpp
index 2a8beb828ee..2a8beb828ee 100644
--- a/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cc b/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cpp
index 9de3d925ffe..cc57b3b7e5f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cpp
@@ -11,7 +11,7 @@ DWORD CALLBACK work_item(LPVOID) {
   stack_buffer[subscript] = 42;
   // CHECK: AddressSanitizer: stack-buffer-underflow on address [[ADDR:0x[0-9a-f]+]]
   // CHECK: WRITE of size 1 at [[ADDR]] thread T{{[0-9]+}}
-  // CHECK:   {{#0 .* work_item.*queue_user_work_item_report.cc}}:[[@LINE-3]]
+  // CHECK:   {{#0 .* work_item.*queue_user_work_item_report.cpp}}:[[@LINE-3]]
   SetEvent(done);
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cpp
index 376214e34ed..08fd6c91b40 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*realloc_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*realloc_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* realloc }}
-// CHECK-NEXT: {{#1 .* main .*realloc_left_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*realloc_left_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cpp
index 57934e47857..aded5a057e2 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cpp
@@ -8,10 +8,10 @@ int main() {
   buffer[42] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*realloc_right_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*realloc_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 42-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* realloc }}
-// CHECK-NEXT: {{#1 .* main .*realloc_right_oob.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*realloc_right_oob.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cpp
index 8e318736b7a..7454d5ab2a9 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cpp
@@ -9,12 +9,12 @@ int main() {
   buffer[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*realloc_uaf.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*realloc_uaf.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
 // CHECK: freed by thread T0 here:
 // CHECK-NEXT: {{#0 .* free }}
-// CHECK-NEXT: {{#1 .* main .*realloc_uaf.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*realloc_uaf.cpp}}:[[@LINE-8]]
 // CHECK: previously allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* realloc }}
-// CHECK-NEXT: {{#1 .* main .*realloc_uaf.cc}}:[[@LINE-12]]
+// CHECK-NEXT: {{#1 .* main .*realloc_uaf.cpp}}:[[@LINE-12]]
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/recalloc_sanity.cc b/compiler-rt/test/asan/TestCases/Windows/recalloc_sanity.cpp
index 41df5d002a0..41df5d002a0 100644
--- a/compiler-rt/test/asan/TestCases/Windows/recalloc_sanity.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/recalloc_sanity.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/report_after_syminitialize.cc b/compiler-rt/test/asan/TestCases/Windows/report_after_syminitialize.cpp
index eec50297478..c406152e9af 100644
--- a/compiler-rt/test/asan/TestCases/Windows/report_after_syminitialize.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/report_after_syminitialize.cpp
@@ -20,6 +20,6 @@ int main() {
   // CHECK: Hint: address points to the zero page.
   // CHECK: {{WARNING: .*DbgHelp}}
   // CHECK: {{WARNING: Failed to use and restart external symbolizer}}
-  // CHECK: {{#0 0x.* in main.*report_after_syminitialize.cc:}}[[@LINE-6]]
+  // CHECK: {{#0 0x.* in main.*report_after_syminitialize.cpp:}}[[@LINE-6]]
   // CHECK: AddressSanitizer can not provide additional info.
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cc b/compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cpp
index eb6d4bc39d5..eb6d4bc39d5 100644
--- a/compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc b/compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cpp
index 9619aff6a74..9619aff6a74 100644
--- a/compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cc b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cpp
index 6ef1caa0ec2..6ef1caa0ec2 100644
--- a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_double_free.cc b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_double_free.cpp
index 07811450630..07811450630 100644
--- a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_double_free.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_double_free.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_realloc.cc b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_realloc.cpp
index a2758cad236..a2758cad236 100644
--- a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_realloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_dll_unload_realloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cc b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cpp
index d7e81ac3a0f..d7e81ac3a0f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cc b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cpp
index 92d2940a51e..92d2940a51e 100644
--- a/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/seh.cc b/compiler-rt/test/asan/TestCases/Windows/seh.cpp
index 4cb0c55bc77..4cb0c55bc77 100644
--- a/compiler-rt/test/asan/TestCases/Windows/seh.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/seh.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/shadow_conflict_32.cc b/compiler-rt/test/asan/TestCases/Windows/shadow_conflict_32.cpp
index a2b6b4688bc..9e144be9120 100644
--- a/compiler-rt/test/asan/TestCases/Windows/shadow_conflict_32.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/shadow_conflict_32.cpp
@@ -24,6 +24,6 @@ extern "C" __declspec(dllexport) int test_function() { return 0; }
 // CHECK: =={{[0-9:]+}}==ASan shadow was supposed to be located in the [0x2fff0000-0x3fffffff] range.
 // CHECK: =={{[0-9:]+}}==Dumping process modules
 
-// CHECK-DAG: {{0x30000000-0x300.....}} {{.*}}\shadow_conflict_32.cc.tmp_dll.dll
-// CHECK-DAG: {{0x........-0x........}} {{.*}}\shadow_conflict_32.cc.tmp.exe
+// CHECK-DAG: {{0x30000000-0x300.....}} {{.*}}\shadow_conflict_32.cpp.tmp_dll.dll
+// CHECK-DAG: {{0x........-0x........}} {{.*}}\shadow_conflict_32.cpp.tmp.exe
 // CHECK-DAG: {{0x........-0x........}} {{.*}}\ntdll.dll
diff --git a/compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cc b/compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cpp
index c774689941b..c774689941b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cpp
index ea7119b4c81..ff36185395b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cpp
@@ -9,8 +9,8 @@ int main() {
   buffer[subscript] = 42;
 // CHECK: AddressSanitizer: stack-buffer-underflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*stack_array_left_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*stack_array_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT: {{#0 .* main .*stack_array_left_oob.cc}}
+// CHECK-NEXT: {{#0 .* main .*stack_array_left_oob.cpp}}
 // CHECK: 'buffer'{{.*}} <== Memory access at offset [[OFFSET]] underflows this variable
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cpp
index bbcb96f8fc7..20270ffce38 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cpp
@@ -9,8 +9,8 @@ int main() {
   buffer[subscript] = 42;
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*stack_array_right_oob.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*stack_array_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: Address [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT: {{#0 .* main .*stack_array_right_oob.cc}}
+// CHECK-NEXT: {{#0 .* main .*stack_array_right_oob.cpp}}
 // CHECK: 'buffer'{{.*}} <== Memory access at offset [[OFFSET]] overflows this variable
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cc b/compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cpp
index 156e9f86fc3..156e9f86fc3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc b/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cpp
index 4070bf628c8..9773084f81a 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cpp
@@ -13,10 +13,10 @@ int main() {
   *x = 42;
 // CHECK: AddressSanitizer: stack-use-after-return
 // CHECK: WRITE of size 1 at {{.*}} thread T0
-// CHECK-NEXT: {{#0 0x.* in main .*stack_use_after_return.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 0x.* in main .*stack_use_after_return.cpp}}:[[@LINE-3]]
 //
 // CHECK: is located in stack of thread T0 at offset [[OFFSET:.*]] in frame
-// CHECK-NEXT: {{#0 0x.* in foo.*stack_use_after_return.cc}}
+// CHECK-NEXT: {{#0 0x.* in foo.*stack_use_after_return.cpp}}
 //
 // CHECK: 'stack_buffer'{{.*}} <== Memory access at offset [[OFFSET]] is inside this variable
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/symbols_path.cc b/compiler-rt/test/asan/TestCases/Windows/symbols_path.cpp
index f121727613c..bb07570d8a3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/symbols_path.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/symbols_path.cpp
@@ -13,10 +13,10 @@ int main() {
   buffer[-1] = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*symbols_path.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*symbols_path.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 1 bytes to the left of 42-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* malloc}}
-// CHECK-NEXT: {{#1 .* main .*symbols_path.cc}}:[[@LINE-8]]
+// CHECK-NEXT: {{#1 .* main .*symbols_path.cpp}}:[[@LINE-8]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_simple.cc b/compiler-rt/test/asan/TestCases/Windows/thread_simple.cpp
index fd9ac4c289b..fd9ac4c289b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_simple.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_simple.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cpp
index 2280c10369d..2b99bc79068 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cpp
@@ -9,7 +9,7 @@ DWORD WINAPI thread_proc(void *) {
   stack_buffer[subscript] = 42;
 // CHECK: AddressSanitizer: stack-buffer-underflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T1
-// CHECK:   {{#0 .* thread_proc.*thread_stack_array_left_oob.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* thread_proc.*thread_stack_array_left_oob.cpp}}:[[@LINE-3]]
 // CHECK: Address [[ADDR]] is located in stack of thread T1 at offset {{.*}} in frame
 // CHECK:   thread_proc
   return 0;
@@ -18,7 +18,7 @@ DWORD WINAPI thread_proc(void *) {
 int main() {
   HANDLE thr = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL);
 // CHECK: Thread T1 created by T0 here:
-// CHECK:   {{#[01] .* main .*thread_stack_array_left_oob.cc}}:[[@LINE-2]]
+// CHECK:   {{#[01] .* main .*thread_stack_array_left_oob.cpp}}:[[@LINE-2]]
 
   // A failure to create a thread should fail the test!
   if (thr == 0) return 0;
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cpp
index 939b984c53f..eaae86936fd 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cpp
@@ -9,7 +9,7 @@ DWORD WINAPI thread_proc(void *) {
   stack_buffer[subscript] = 42;
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T1
-// CHECK:   {{#0 .* thread_proc.*thread_stack_array_right_oob.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 .* thread_proc.*thread_stack_array_right_oob.cpp}}:[[@LINE-3]]
 // CHECK: Address [[ADDR]] is located in stack of thread T1 at offset {{.*}} in frame
 // CHECK:   thread_proc
   return 0;
@@ -18,7 +18,7 @@ DWORD WINAPI thread_proc(void *) {
 int main(void) {
   HANDLE thr = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL);
 // CHECK: Thread T1 created by T0 here:
-// CHECK:   {{#[01] .* main .*thread_stack_array_right_oob.cc}}:[[@LINE-2]]
+// CHECK:   {{#[01] .* main .*thread_stack_array_right_oob.cpp}}:[[@LINE-2]]
 
   // A failure to create a thread should fail the test!
   if (thr == 0) return 0;
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cpp
index e7b12ca2a33..e7b12ca2a33 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stress.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stress.cpp
index e25cc6a3c2f..e25cc6a3c2f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stress.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stress.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_suspended.cc b/compiler-rt/test/asan/TestCases/Windows/thread_suspended.cpp
index b30cf148411..b30cf148411 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_suspended.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_suspended.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/tls_init.cc b/compiler-rt/test/asan/TestCases/Windows/tls_init.cpp
index a8569f8025c..a8569f8025c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/tls_init.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/tls_init.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/unsymbolized.cc b/compiler-rt/test/asan/TestCases/Windows/unsymbolized.cpp
index 5854dc56d2e..2c45258016f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/unsymbolized.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/unsymbolized.cpp
@@ -20,6 +20,6 @@ int do_uaf(void) {
   free(x);
   return x[5];
   // CHECK: AddressSanitizer: heap-use-after-free
-  // CHECK: #0 {{0x[a-f0-9]+ \(.*[\\/]unsymbolized.cc.*.exe\+(0x40|0x14000)[a-f0-9]{4}\)}}
-  // CHECK: #1 {{0x[a-f0-9]+ \(.*[\\/]unsymbolized.cc.*.exe\+(0x40|0x14000)[a-f0-9]{4}\)}}
+  // CHECK: #0 {{0x[a-f0-9]+ \(.*[\\/]unsymbolized.cpp.*.exe\+(0x40|0x14000)[a-f0-9]{4}\)}}
+  // CHECK: #1 {{0x[a-f0-9]+ \(.*[\\/]unsymbolized.cpp.*.exe\+(0x40|0x14000)[a-f0-9]{4}\)}}
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc b/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cpp
index c39f4cf06ef..ce116f9aaf3 100644
--- a/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cpp
@@ -11,13 +11,13 @@ int main() {
   stale[0] = 42;
 // CHECK: AddressSanitizer: heap-use-after-free on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 1 at [[ADDR]] thread T0
-// CHECK-NEXT: {{#0 .* main .*use_after_realloc.cc}}:[[@LINE-3]]
+// CHECK-NEXT: {{#0 .* main .*use_after_realloc.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes inside of 32-byte region
 // CHECK: freed by thread T0 here:
 // CHECK-NEXT: {{#0 .* realloc }}
-// CHECK-NEXT: {{#1 .* main .*use_after_realloc.cc}}:[[@LINE-9]]
+// CHECK-NEXT: {{#1 .* main .*use_after_realloc.cpp}}:[[@LINE-9]]
 // CHECK: previously allocated by thread T0 here:
 // CHECK-NEXT: {{#0 .* realloc }}
-// CHECK-NEXT: {{#1 .* main .*use_after_realloc.cc}}:[[@LINE-14]]
+// CHECK-NEXT: {{#1 .* main .*use_after_realloc.cpp}}:[[@LINE-14]]
   free(buffer);
 }
diff --git a/compiler-rt/test/asan/TestCases/Windows/use_after_return_linkage.cc b/compiler-rt/test/asan/TestCases/Windows/use_after_return_linkage.cpp
index 48c5065a0fa..48c5065a0fa 100644
--- a/compiler-rt/test/asan/TestCases/Windows/use_after_return_linkage.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/use_after_return_linkage.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/user-exception.cc b/compiler-rt/test/asan/TestCases/Windows/user-exception.cpp
index ba14a8b23ab..ba14a8b23ab 100644
--- a/compiler-rt/test/asan/TestCases/Windows/user-exception.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/user-exception.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/windows_h.cc b/compiler-rt/test/asan/TestCases/Windows/windows_h.cpp
index f20edec0cec..f20edec0cec 100644
--- a/compiler-rt/test/asan/TestCases/Windows/windows_h.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/windows_h.cpp
diff --git a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cpp
index a703d178dd1..b9627089436 100644
--- a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cpp
@@ -17,7 +17,7 @@ int main(void) {
   c->extra_field = 42;
 // CHECK: AddressSanitizer: heap-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK:   {{#0 0x[0-9a-f]* in main .*wrong_downcast_on_heap.cc}}:[[@LINE-3]]
+// CHECK:   {{#0 0x[0-9a-f]* in main .*wrong_downcast_on_heap.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located 0 bytes to the right of 4-byte region
 // CHECK: allocated by thread T0 here:
 // CHECK:   #0 {{.*}} operator new
diff --git a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cpp
index 5e28eb63909..267775e4689 100644
--- a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cpp
@@ -17,7 +17,7 @@ int main(void) {
   c->extra_field = 42;
 // CHECK: AddressSanitizer: stack-buffer-overflow on address [[ADDR:0x[0-9a-f]+]]
 // CHECK: WRITE of size 4 at [[ADDR]] thread T0
-// CHECK-NEXT:  {{#0 0x[0-9a-f]* in main .*wrong_downcast_on_stack.cc}}:[[@LINE-3]]
+// CHECK-NEXT:  {{#0 0x[0-9a-f]* in main .*wrong_downcast_on_stack.cpp}}:[[@LINE-3]]
 // CHECK: [[ADDR]] is located in stack of thread T0 at offset [[OFFSET:[0-9]+]] in frame
 // CHECK-NEXT:  {{#0 0x[0-9a-f]* in main }}
 // CHECK:  'p'{{.*}} <== Memory access at offset [[OFFSET]] overflows this variable
diff --git a/compiler-rt/test/asan/TestCases/alloca_big_alignment.cc b/compiler-rt/test/asan/TestCases/alloca_big_alignment.cpp
index 0b49424bfae..0b49424bfae 100644
--- a/compiler-rt/test/asan/TestCases/alloca_big_alignment.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_big_alignment.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_constant_size.cc b/compiler-rt/test/asan/TestCases/alloca_constant_size.cpp
index 8910ea9f8d8..8910ea9f8d8 100644
--- a/compiler-rt/test/asan/TestCases/alloca_constant_size.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_constant_size.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_detect_custom_size_.cc b/compiler-rt/test/asan/TestCases/alloca_detect_custom_size_.cpp
index 271359bf709..271359bf709 100644
--- a/compiler-rt/test/asan/TestCases/alloca_detect_custom_size_.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_detect_custom_size_.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_instruments_all_paddings.cc b/compiler-rt/test/asan/TestCases/alloca_instruments_all_paddings.cpp
index 5bf6f80ac4c..5bf6f80ac4c 100644
--- a/compiler-rt/test/asan/TestCases/alloca_instruments_all_paddings.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_instruments_all_paddings.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_loop_unpoisoning.cc b/compiler-rt/test/asan/TestCases/alloca_loop_unpoisoning.cpp
index f9d32aafdc8..f9d32aafdc8 100644
--- a/compiler-rt/test/asan/TestCases/alloca_loop_unpoisoning.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_loop_unpoisoning.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_overflow_partial.cc b/compiler-rt/test/asan/TestCases/alloca_overflow_partial.cpp
index afac40ce6b9..afac40ce6b9 100644
--- a/compiler-rt/test/asan/TestCases/alloca_overflow_partial.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_overflow_partial.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_overflow_right.cc b/compiler-rt/test/asan/TestCases/alloca_overflow_right.cpp
index 615dd1485be..615dd1485be 100644
--- a/compiler-rt/test/asan/TestCases/alloca_overflow_right.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_overflow_right.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_safe_access.cc b/compiler-rt/test/asan/TestCases/alloca_safe_access.cpp
index 1cd0dada7b4..1cd0dada7b4 100644
--- a/compiler-rt/test/asan/TestCases/alloca_safe_access.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_safe_access.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_underflow_left.cc b/compiler-rt/test/asan/TestCases/alloca_underflow_left.cpp
index 8720e8cce24..8720e8cce24 100644
--- a/compiler-rt/test/asan/TestCases/alloca_underflow_left.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_underflow_left.cpp
diff --git a/compiler-rt/test/asan/TestCases/alloca_vla_interact.cc b/compiler-rt/test/asan/TestCases/alloca_vla_interact.cpp
index 92b0afafc8d..92b0afafc8d 100644
--- a/compiler-rt/test/asan/TestCases/alloca_vla_interact.cc
+++ b/compiler-rt/test/asan/TestCases/alloca_vla_interact.cpp
diff --git a/compiler-rt/test/asan/TestCases/asan_and_llvm_coverage_test.cc b/compiler-rt/test/asan/TestCases/asan_and_llvm_coverage_test.cpp
index 2ba5a42d1b7..2ba5a42d1b7 100644
--- a/compiler-rt/test/asan/TestCases/asan_and_llvm_coverage_test.cc
+++ b/compiler-rt/test/asan/TestCases/asan_and_llvm_coverage_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/asan_options-help.cc b/compiler-rt/test/asan/TestCases/asan_options-help.cpp
index 96a9cd98fc4..96a9cd98fc4 100644
--- a/compiler-rt/test/asan/TestCases/asan_options-help.cc
+++ b/compiler-rt/test/asan/TestCases/asan_options-help.cpp
diff --git a/compiler-rt/test/asan/TestCases/atexit_stats.cc b/compiler-rt/test/asan/TestCases/atexit_stats.cpp
index c8d97da5292..c8d97da5292 100644
--- a/compiler-rt/test/asan/TestCases/atexit_stats.cc
+++ b/compiler-rt/test/asan/TestCases/atexit_stats.cpp
diff --git a/compiler-rt/test/asan/TestCases/blacklist.cc b/compiler-rt/test/asan/TestCases/blacklist.cpp
index 7c31484c217..9508f6f4d97 100644
--- a/compiler-rt/test/asan/TestCases/blacklist.cc
+++ b/compiler-rt/test/asan/TestCases/blacklist.cpp
@@ -2,15 +2,15 @@
 
 // RUN: echo "fun:*brokenFunction*" > %tmp
 // RUN: echo "global:*badGlobal*" >> %tmp
-// RUN: echo "src:*blacklist-extra.cc" >> %tmp
+// RUN: echo "src:*blacklist-extra.cpp" >> %tmp
 // RUN: %clangxx_asan -fsanitize-blacklist=%tmp -O0 %s -o %t \
-// RUN: %p/Helpers/blacklist-extra.cc && %run %t 2>&1
+// RUN: %p/Helpers/blacklist-extra.cpp && %run %t 2>&1
 // RUN: %clangxx_asan -fsanitize-blacklist=%tmp -O1 %s -o %t \
-// RUN: %p/Helpers/blacklist-extra.cc && %run %t 2>&1
+// RUN: %p/Helpers/blacklist-extra.cpp && %run %t 2>&1
 // RUN: %clangxx_asan -fsanitize-blacklist=%tmp -O2 %s -o %t \
-// RUN: %p/Helpers/blacklist-extra.cc && %run %t 2>&1
+// RUN: %p/Helpers/blacklist-extra.cpp && %run %t 2>&1
 // RUN: %clangxx_asan -fsanitize-blacklist=%tmp -O3 %s -o %t \
-// RUN: %p/Helpers/blacklist-extra.cc && %run %t 2>&1
+// RUN: %p/Helpers/blacklist-extra.cpp && %run %t 2>&1
 
 // badGlobal is accessed improperly, but we blacklisted it. Align
 // it to make sure memory past the end of badGlobal will be in
@@ -26,7 +26,7 @@ int brokenFunction(int argc) {
   return x[argc * 10];  // BOOM
 }
 
-// This function is defined in Helpers/blacklist-extra.cc, a source file which
+// This function is defined in Helpers/blacklist-extra.cpp, a source file which
 // is blacklisted by name
 int externalBrokenFunction(int x);
 
diff --git a/compiler-rt/test/asan/TestCases/calloc-overflow.cc b/compiler-rt/test/asan/TestCases/calloc-overflow.cpp
index 74582378fd2..9a0d41ff826 100644
--- a/compiler-rt/test/asan/TestCases/calloc-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/calloc-overflow.cpp
@@ -11,7 +11,7 @@ int main() {
   void *p = calloc(-1, 1000);
   // CHECK: {{ERROR: AddressSanitizer: calloc parameters overflow: count \* size \(.* \* 1000\) cannot be represented in type size_t}}
   // CHECK: {{#0 0x.* in .*calloc}}
-  // CHECK: {{#1 0x.* in main .*calloc-overflow.cc:}}[[@LINE-3]]
+  // CHECK: {{#1 0x.* in main .*calloc-overflow.cpp:}}[[@LINE-3]]
   // CHECK: SUMMARY: AddressSanitizer: calloc-overflow
 
   printf("calloc returned: %zu\n", (size_t)p);
diff --git a/compiler-rt/test/asan/TestCases/contiguous_container.cc b/compiler-rt/test/asan/TestCases/contiguous_container.cpp
index 3f754562af3..3f754562af3 100644
--- a/compiler-rt/test/asan/TestCases/contiguous_container.cc
+++ b/compiler-rt/test/asan/TestCases/contiguous_container.cpp
diff --git a/compiler-rt/test/asan/TestCases/contiguous_container_crash.cc b/compiler-rt/test/asan/TestCases/contiguous_container_crash.cpp
index 2b555f9019e..2b555f9019e 100644
--- a/compiler-rt/test/asan/TestCases/contiguous_container_crash.cc
+++ b/compiler-rt/test/asan/TestCases/contiguous_container_crash.cpp
diff --git a/compiler-rt/test/asan/TestCases/coverage-and-lsan.cc b/compiler-rt/test/asan/TestCases/coverage-and-lsan.cpp
index 60851dabb6b..60851dabb6b 100644
--- a/compiler-rt/test/asan/TestCases/coverage-and-lsan.cc
+++ b/compiler-rt/test/asan/TestCases/coverage-and-lsan.cpp
diff --git a/compiler-rt/test/asan/TestCases/coverage-disabled.cc b/compiler-rt/test/asan/TestCases/coverage-disabled.cpp
index 46a822dff08..46a822dff08 100644
--- a/compiler-rt/test/asan/TestCases/coverage-disabled.cc
+++ b/compiler-rt/test/asan/TestCases/coverage-disabled.cpp
diff --git a/compiler-rt/test/asan/TestCases/coverage-trace-pc.cc b/compiler-rt/test/asan/TestCases/coverage-trace-pc.cpp
index c03a6f02f77..c03a6f02f77 100644
--- a/compiler-rt/test/asan/TestCases/coverage-trace-pc.cc
+++ b/compiler-rt/test/asan/TestCases/coverage-trace-pc.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_double_free.cc b/compiler-rt/test/asan/TestCases/debug_double_free.cpp
index 44c820b638d..44c820b638d 100644
--- a/compiler-rt/test/asan/TestCases/debug_double_free.cc
+++ b/compiler-rt/test/asan/TestCases/debug_double_free.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_locate.cc b/compiler-rt/test/asan/TestCases/debug_locate.cpp
index 5971a772786..5971a772786 100644
--- a/compiler-rt/test/asan/TestCases/debug_locate.cc
+++ b/compiler-rt/test/asan/TestCases/debug_locate.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_mapping.cc b/compiler-rt/test/asan/TestCases/debug_mapping.cpp
index 40083f02853..40083f02853 100644
--- a/compiler-rt/test/asan/TestCases/debug_mapping.cc
+++ b/compiler-rt/test/asan/TestCases/debug_mapping.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_ppc64_mapping.cc b/compiler-rt/test/asan/TestCases/debug_ppc64_mapping.cpp
index a67804023c0..a67804023c0 100644
--- a/compiler-rt/test/asan/TestCases/debug_ppc64_mapping.cc
+++ b/compiler-rt/test/asan/TestCases/debug_ppc64_mapping.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_report.cc b/compiler-rt/test/asan/TestCases/debug_report.cpp
index 14bb70e9f59..14bb70e9f59 100644
--- a/compiler-rt/test/asan/TestCases/debug_report.cc
+++ b/compiler-rt/test/asan/TestCases/debug_report.cpp
diff --git a/compiler-rt/test/asan/TestCases/debug_stacks.cc b/compiler-rt/test/asan/TestCases/debug_stacks.cpp
index 7c320bfcb2d..7c320bfcb2d 100644
--- a/compiler-rt/test/asan/TestCases/debug_stacks.cc
+++ b/compiler-rt/test/asan/TestCases/debug_stacks.cpp
diff --git a/compiler-rt/test/asan/TestCases/deep_stack_uaf.cc b/compiler-rt/test/asan/TestCases/deep_stack_uaf.cpp
index bdf0dbdb4a4..bdf0dbdb4a4 100644
--- a/compiler-rt/test/asan/TestCases/deep_stack_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/deep_stack_uaf.cpp
diff --git a/compiler-rt/test/asan/TestCases/deep_tail_call.cc b/compiler-rt/test/asan/TestCases/deep_tail_call.cpp
index 628ef06db14..628ef06db14 100644
--- a/compiler-rt/test/asan/TestCases/deep_tail_call.cc
+++ b/compiler-rt/test/asan/TestCases/deep_tail_call.cpp
diff --git a/compiler-rt/test/asan/TestCases/default_blacklist.cc b/compiler-rt/test/asan/TestCases/default_blacklist.cpp
index 84c0438f305..84c0438f305 100644
--- a/compiler-rt/test/asan/TestCases/default_blacklist.cc
+++ b/compiler-rt/test/asan/TestCases/default_blacklist.cpp
diff --git a/compiler-rt/test/asan/TestCases/default_options.cc b/compiler-rt/test/asan/TestCases/default_options.cpp
index 27af76d7fe3..27af76d7fe3 100644
--- a/compiler-rt/test/asan/TestCases/default_options.cc
+++ b/compiler-rt/test/asan/TestCases/default_options.cpp
diff --git a/compiler-rt/test/asan/TestCases/describe_address.cc b/compiler-rt/test/asan/TestCases/describe_address.cpp
index 868c0eb1c44..868c0eb1c44 100644
--- a/compiler-rt/test/asan/TestCases/describe_address.cc
+++ b/compiler-rt/test/asan/TestCases/describe_address.cpp
diff --git a/compiler-rt/test/asan/TestCases/double-free.cc b/compiler-rt/test/asan/TestCases/double-free.cpp
index 2a26b23fb1f..b01e41005a2 100644
--- a/compiler-rt/test/asan/TestCases/double-free.cc
+++ b/compiler-rt/test/asan/TestCases/double-free.cpp
@@ -19,12 +19,12 @@ int main(int argc, char **argv) {
   free(x + argc - 1);  // BOOM
   // CHECK: AddressSanitizer: attempting double-free{{.*}}in thread T0
   // CHECK: #0 0x{{.*}} in {{.*}}free
-  // CHECK: #1 0x{{.*}} in main {{.*}}double-free.cc:[[@LINE-3]]
+  // CHECK: #1 0x{{.*}} in main {{.*}}double-free.cpp:[[@LINE-3]]
   // CHECK: freed by thread T0 here:
   // MALLOC-CTX: #0 0x{{.*}} in {{.*}}free
-  // MALLOC-CTX: #1 0x{{.*}} in main {{.*}}double-free.cc:[[@LINE-7]]
+  // MALLOC-CTX: #1 0x{{.*}} in main {{.*}}double-free.cpp:[[@LINE-7]]
   // CHECK: allocated by thread T0 here:
-  // MALLOC-CTX: double-free.cc:[[@LINE-12]]
+  // MALLOC-CTX: double-free.cpp:[[@LINE-12]]
   // CHECK-RECOVER: AddressSanitizer: attempting double-free{{.*}}in thread T0
   // CHECK-RECOVER-NOT: AddressSanitizer CHECK failed:
   return res;
diff --git a/compiler-rt/test/asan/TestCases/error_report_callback.cc b/compiler-rt/test/asan/TestCases/error_report_callback.cpp
index 8c5bbe418fc..8c5bbe418fc 100644
--- a/compiler-rt/test/asan/TestCases/error_report_callback.cc
+++ b/compiler-rt/test/asan/TestCases/error_report_callback.cpp
diff --git a/compiler-rt/test/asan/TestCases/exitcode.cc b/compiler-rt/test/asan/TestCases/exitcode.cpp
index cb10540999b..cb10540999b 100644
--- a/compiler-rt/test/asan/TestCases/exitcode.cc
+++ b/compiler-rt/test/asan/TestCases/exitcode.cpp
diff --git a/compiler-rt/test/asan/TestCases/force_inline_opt0.cc b/compiler-rt/test/asan/TestCases/force_inline_opt0.cpp
index e6e5d26c799..e6e5d26c799 100644
--- a/compiler-rt/test/asan/TestCases/force_inline_opt0.cc
+++ b/compiler-rt/test/asan/TestCases/force_inline_opt0.cpp
diff --git a/compiler-rt/test/asan/TestCases/frexp_interceptor.cc b/compiler-rt/test/asan/TestCases/frexp_interceptor.cpp
index d75ba992b65..d75ba992b65 100644
--- a/compiler-rt/test/asan/TestCases/frexp_interceptor.cc
+++ b/compiler-rt/test/asan/TestCases/frexp_interceptor.cpp
diff --git a/compiler-rt/test/asan/TestCases/global-demangle.cc b/compiler-rt/test/asan/TestCases/global-demangle.cpp
index 5f7ff91b160..5f7ff91b160 100644
--- a/compiler-rt/test/asan/TestCases/global-demangle.cc
+++ b/compiler-rt/test/asan/TestCases/global-demangle.cpp
diff --git a/compiler-rt/test/asan/TestCases/global-location.cc b/compiler-rt/test/asan/TestCases/global-location.cpp
index 795e50bf614..42711f97c21 100644
--- a/compiler-rt/test/asan/TestCases/global-location.cc
+++ b/compiler-rt/test/asan/TestCases/global-location.cpp
@@ -13,9 +13,9 @@ struct C {
 };
 
 int global[10];
-// GLOB: 0x{{.*}} is located 4 bytes to the right of global variable 'global' defined in '{{.*}}global-location.cc:[[@LINE-1]]:5' {{.*}} of size 40
+// GLOB: 0x{{.*}} is located 4 bytes to the right of global variable 'global' defined in '{{.*}}global-location.cpp:[[@LINE-1]]:5' {{.*}} of size 40
 int C::array[10];
-// CLASS_STATIC: 0x{{.*}} is located 4 bytes to the right of global variable 'C::array' defined in '{{.*}}global-location.cc:[[@LINE-1]]:8' {{.*}} of size 40
+// CLASS_STATIC: 0x{{.*}} is located 4 bytes to the right of global variable 'C::array' defined in '{{.*}}global-location.cpp:[[@LINE-1]]:8' {{.*}} of size 40
 
 int main(int argc, char **argv) {
   int one = argc - 1;
@@ -24,12 +24,12 @@ int main(int argc, char **argv) {
   case 'c': return C::array[one * 11];
   case 'f':
     static int array[10];
-    // FUNC_STATIC: 0x{{.*}} is located 4 bytes to the right of global variable 'array' defined in '{{.*}}global-location.cc:[[@LINE-1]]:16' {{.*}} of size 40
+    // FUNC_STATIC: 0x{{.*}} is located 4 bytes to the right of global variable 'array' defined in '{{.*}}global-location.cpp:[[@LINE-1]]:16' {{.*}} of size 40
     memset(array, 0, 10);
     return array[one * 11];
   case 'l':
     const char *str = "0123456789";
-    // LITERAL: 0x{{.*}} is located 0 bytes to the right of global variable {{.*}} defined in '{{.*}}global-location.cc:[[@LINE-1]]:23' {{.*}} of size 11
+    // LITERAL: 0x{{.*}} is located 0 bytes to the right of global variable {{.*}} defined in '{{.*}}global-location.cpp:[[@LINE-1]]:23' {{.*}} of size 11
     return str[one * 11];
   }
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/global-overflow.cc b/compiler-rt/test/asan/TestCases/global-overflow.cpp
index a39a9530635..d0aab2adee3 100644
--- a/compiler-rt/test/asan/TestCases/global-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/global-overflow.cpp
@@ -13,7 +13,7 @@ int main(int argc, char **argv) {
   memset(ZZZ, 0, 10);
   int res = YYY[argc * 10];  // BOOOM
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*global-overflow.cc:}}[[@LINE-2]]
+  // CHECK: {{    #0 0x.* in main .*global-overflow.cpp:}}[[@LINE-2]]
   // CHECK: {{0x.* is located 0 bytes to the right of global variable}}
   // CHECK:   {{.*YYY.* of size 10}}
   res += XXX[argc] + ZZZ[argc];
diff --git a/compiler-rt/test/asan/TestCases/global-underflow.cc b/compiler-rt/test/asan/TestCases/global-underflow.cc
deleted file mode 100644
index 4a03513567c..00000000000
--- a/compiler-rt/test/asan/TestCases/global-underflow.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %clangxx_asan -O0 %s %p/Helpers/underflow.cc -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -O1 %s %p/Helpers/underflow.cc -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -O2 %s %p/Helpers/underflow.cc -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -O3 %s %p/Helpers/underflow.cc -o %t && not %run %t 2>&1 | FileCheck %s
-
-int XXX[2] = {2, 3};
-extern int YYY[];
-#include <string.h>
-int main(int argc, char **argv) {
-  memset(XXX, 0, 2*sizeof(int));
-  // CHECK: {{READ of size 4 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*global-underflow.cc:}}[[@LINE+3]]
-  // CHECK: {{0x.* is located 4 bytes to the left of global variable}}
-  // CHECK:   {{.*YYY.* of size 12}}
-  int res = YYY[-1];
-  return res;
-}
diff --git a/compiler-rt/test/asan/TestCases/global-underflow.cpp b/compiler-rt/test/asan/TestCases/global-underflow.cpp
new file mode 100644
index 00000000000..81aac589711
--- /dev/null
+++ b/compiler-rt/test/asan/TestCases/global-underflow.cpp
@@ -0,0 +1,17 @@
+// RUN: %clangxx_asan -O0 %s %p/Helpers/underflow.cpp -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_asan -O1 %s %p/Helpers/underflow.cpp -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_asan -O2 %s %p/Helpers/underflow.cpp -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_asan -O3 %s %p/Helpers/underflow.cpp -o %t && not %run %t 2>&1 | FileCheck %s
+
+int XXX[2] = {2, 3};
+extern int YYY[];
+#include <string.h>
+int main(int argc, char **argv) {
+  memset(XXX, 0, 2*sizeof(int));
+  // CHECK: {{READ of size 4 at 0x.* thread T0}}
+  // CHECK: {{    #0 0x.* in main .*global-underflow.cpp:}}[[@LINE+3]]
+  // CHECK: {{0x.* is located 4 bytes to the left of global variable}}
+  // CHECK:   {{.*YYY.* of size 12}}
+  int res = YYY[-1];
+  return res;
+}
diff --git a/compiler-rt/test/asan/TestCases/handle_noreturn_bug.cc b/compiler-rt/test/asan/TestCases/handle_noreturn_bug.cpp
index 8c3c66a423d..8c3c66a423d 100644
--- a/compiler-rt/test/asan/TestCases/handle_noreturn_bug.cc
+++ b/compiler-rt/test/asan/TestCases/handle_noreturn_bug.cpp
diff --git a/compiler-rt/test/asan/TestCases/heap-overflow-large.cc b/compiler-rt/test/asan/TestCases/heap-overflow-large.cpp
index 566b1158a5d..566b1158a5d 100644
--- a/compiler-rt/test/asan/TestCases/heap-overflow-large.cc
+++ b/compiler-rt/test/asan/TestCases/heap-overflow-large.cpp
diff --git a/compiler-rt/test/asan/TestCases/heap-overflow.cc b/compiler-rt/test/asan/TestCases/heap-overflow.cpp
index 3ddb243b3ec..a9b62d87435 100644
--- a/compiler-rt/test/asan/TestCases/heap-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/heap-overflow.cpp
@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
   memset(x, 0, 10);
   int res = x[argc * 10];  // BOOOM
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*heap-overflow.cc:}}[[@LINE-2]]
+  // CHECK: {{    #0 0x.* in main .*heap-overflow.cpp:}}[[@LINE-2]]
   // CHECK: {{0x.* is located 0 bytes to the right of 10-byte region}}
   // CHECK: {{allocated by thread T0 here:}}
 
diff --git a/compiler-rt/test/asan/TestCases/heavy_uar_test.cc b/compiler-rt/test/asan/TestCases/heavy_uar_test.cpp
index 29a1d196567..a203174e0ae 100644
--- a/compiler-rt/test/asan/TestCases/heavy_uar_test.cc
+++ b/compiler-rt/test/asan/TestCases/heavy_uar_test.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
   stale_stack[100]++;
   // CHECK: ERROR: AddressSanitizer: stack-use-after-return on address
   // CHECK: is located in stack of thread T0 at offset {{116|132}} in frame
-  // CHECK:  in LeakStack{{.*}}heavy_uar_test.cc:
+  // CHECK:  in LeakStack{{.*}}heavy_uar_test.cpp:
   // CHECK: [{{16|32}}, {{1040|1056}}) 'x'
   return 0;
 }
diff --git a/compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cc b/compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cpp
index 96e7e613d4b..96e7e613d4b 100644
--- a/compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cc
+++ b/compiler-rt/test/asan/TestCases/huge_negative_hea_oob.cpp
diff --git a/compiler-rt/test/asan/TestCases/ill.cc b/compiler-rt/test/asan/TestCases/ill.cpp
index d7b53509167..d7b53509167 100644
--- a/compiler-rt/test/asan/TestCases/ill.cc
+++ b/compiler-rt/test/asan/TestCases/ill.cpp
diff --git a/compiler-rt/test/asan/TestCases/init-order-atexit.cc b/compiler-rt/test/asan/TestCases/init-order-atexit.cpp
index 021b2bd39a4..57bddd4638c 100644
--- a/compiler-rt/test/asan/TestCases/init-order-atexit.cc
+++ b/compiler-rt/test/asan/TestCases/init-order-atexit.cpp
@@ -4,7 +4,7 @@
 // (3) destructor of A reads uninitialized global C from another module.
 // We do *not* want to report init-order bug in this case.
 
-// RUN: %clangxx_asan -O0 %s %p/Helpers/init-order-atexit-extra.cc -o %t
+// RUN: %clangxx_asan -O0 %s %p/Helpers/init-order-atexit-extra.cpp -o %t
 // RUN: %env_asan_opts=strict_init_order=true not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
diff --git a/compiler-rt/test/asan/TestCases/initialization-blacklist.cc b/compiler-rt/test/asan/TestCases/initialization-blacklist.cpp
index 3a98fc63eee..f0b86e57a8c 100644
--- a/compiler-rt/test/asan/TestCases/initialization-blacklist.cc
+++ b/compiler-rt/test/asan/TestCases/initialization-blacklist.cpp
@@ -1,15 +1,15 @@
 // Test for blacklist functionality of initialization-order checker.
 
-// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-blacklist-extra.cc\
-// RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
+// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-blacklist-extra.cpp\
+// RUN:   %p/Helpers/initialization-blacklist-extra2.cpp \
 // RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-blacklist-extra.cc\
-// RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
+// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-blacklist-extra.cpp\
+// RUN:   %p/Helpers/initialization-blacklist-extra2.cpp \
 // RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-blacklist-extra.cc\
-// RUN:   %p/Helpers/initialization-blacklist-extra2.cc \
+// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-blacklist-extra.cpp\
+// RUN:   %p/Helpers/initialization-blacklist-extra2.cpp \
 // RUN:   -fsanitize-blacklist=%p/Helpers/initialization-blacklist.txt -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 
diff --git a/compiler-rt/test/asan/TestCases/initialization-bug.cc b/compiler-rt/test/asan/TestCases/initialization-bug.cpp
index 20fdbfe5f59..bcf0715c3e0 100644
--- a/compiler-rt/test/asan/TestCases/initialization-bug.cc
+++ b/compiler-rt/test/asan/TestCases/initialization-bug.cpp
@@ -1,6 +1,6 @@
 // Test to make sure basic initialization order errors are caught.
 
-// RUN: %clangxx_asan %macos_min_target_10_11 -O0 %s %p/Helpers/initialization-bug-extra2.cc -o %t-INIT-ORDER-EXE
+// RUN: %clangxx_asan %macos_min_target_10_11 -O0 %s %p/Helpers/initialization-bug-extra2.cpp -o %t-INIT-ORDER-EXE
 // RUN: %env_asan_opts=check_initialization_order=true not %run %t-INIT-ORDER-EXE 2>&1 | FileCheck %s
 
 // Do not test with optimization -- the error may be optimized away.
diff --git a/compiler-rt/test/asan/TestCases/initialization-constexpr.cc b/compiler-rt/test/asan/TestCases/initialization-constexpr.cpp
index 53619ea8186..d920065292e 100644
--- a/compiler-rt/test/asan/TestCases/initialization-constexpr.cc
+++ b/compiler-rt/test/asan/TestCases/initialization-constexpr.cpp
@@ -4,13 +4,13 @@
 // constructor implies that it was initialized during constant initialization,
 // not dynamic initialization).
 
-// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-constexpr-extra.cc --std=c++11 -o %t
+// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-constexpr-extra.cpp --std=c++11 -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-constexpr-extra.cc --std=c++11 -o %t
+// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-constexpr-extra.cpp --std=c++11 -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-constexpr-extra.cc --std=c++11 -o %t
+// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-constexpr-extra.cpp --std=c++11 -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O3 %s %p/Helpers/initialization-constexpr-extra.cc --std=c++11 -o %t
+// RUN: %clangxx_asan -O3 %s %p/Helpers/initialization-constexpr-extra.cpp --std=c++11 -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 
 class Integer {
diff --git a/compiler-rt/test/asan/TestCases/initialization-nobug.cc b/compiler-rt/test/asan/TestCases/initialization-nobug.cpp
index 783c7894d00..d4dc855148a 100644
--- a/compiler-rt/test/asan/TestCases/initialization-nobug.cc
+++ b/compiler-rt/test/asan/TestCases/initialization-nobug.cpp
@@ -1,13 +1,13 @@
 // A collection of various initializers which shouldn't trip up initialization
 // order checking.  If successful, this will just return 0.
 
-// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-nobug-extra.cc -o %t
+// RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-nobug-extra.cpp -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-nobug-extra.cc -o %t
+// RUN: %clangxx_asan -O1 %s %p/Helpers/initialization-nobug-extra.cpp -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-nobug-extra.cc -o %t
+// RUN: %clangxx_asan -O2 %s %p/Helpers/initialization-nobug-extra.cpp -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
-// RUN: %clangxx_asan -O3 %s %p/Helpers/initialization-nobug-extra.cc -o %t
+// RUN: %clangxx_asan -O3 %s %p/Helpers/initialization-nobug-extra.cpp -o %t
 // RUN: %env_asan_opts=check_initialization_order=true %run %t 2>&1
 
 // Simple access:
diff --git a/compiler-rt/test/asan/TestCases/inline.cc b/compiler-rt/test/asan/TestCases/inline.cpp
index daeb7b49eb2..daeb7b49eb2 100644
--- a/compiler-rt/test/asan/TestCases/inline.cc
+++ b/compiler-rt/test/asan/TestCases/inline.cpp
diff --git a/compiler-rt/test/asan/TestCases/intercept-rethrow-exception.cc b/compiler-rt/test/asan/TestCases/intercept-rethrow-exception.cpp
index c3944d6d560..c3944d6d560 100644
--- a/compiler-rt/test/asan/TestCases/intercept-rethrow-exception.cc
+++ b/compiler-rt/test/asan/TestCases/intercept-rethrow-exception.cpp
diff --git a/compiler-rt/test/asan/TestCases/interception_failure_test.cc b/compiler-rt/test/asan/TestCases/interception_failure_test.cpp
index 4f6698e3a53..4f6698e3a53 100644
--- a/compiler-rt/test/asan/TestCases/interception_failure_test.cc
+++ b/compiler-rt/test/asan/TestCases/interception_failure_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/interface_test.cc b/compiler-rt/test/asan/TestCases/interface_test.cpp
index 9419f07e91e..9419f07e91e 100644
--- a/compiler-rt/test/asan/TestCases/interface_test.cc
+++ b/compiler-rt/test/asan/TestCases/interface_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/intra-object-overflow.cc b/compiler-rt/test/asan/TestCases/intra-object-overflow.cpp
index b71e951bb0b..17bf35dfe5e 100644
--- a/compiler-rt/test/asan/TestCases/intra-object-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/intra-object-overflow.cpp
@@ -16,7 +16,7 @@ class Foo {
   }
   void set(int i, int val) { a[i] = val; }
 // CHECK: ERROR: AddressSanitizer: intra-object-overflow
-// CHECK: #0 {{.*}}Foo::set{{.*}}intra-object-overflow.cc:[[@LINE-2]]
+// CHECK: #0 {{.*}}Foo::set{{.*}}intra-object-overflow.cpp:[[@LINE-2]]
  private:
   int pre1, pre2;
   int a[11];
@@ -27,7 +27,7 @@ int main(int argc, char **argv) {
   int idx = argc == 2 ? atoi(argv[1]) : 0;
   Foo *foo = new Foo;
   foo->set(idx, 42);
-// CHECK: #1 {{.*}}main{{.*}}intra-object-overflow.cc:[[@LINE-1]]
+// CHECK: #1 {{.*}}main{{.*}}intra-object-overflow.cpp:[[@LINE-1]]
 // CHECK: is located 84 bytes inside of 128-byte region
   delete foo;
 }
diff --git a/compiler-rt/test/asan/TestCases/invalid-free.cc b/compiler-rt/test/asan/TestCases/invalid-free.cpp
index be45e438bd4..f550dc14a5a 100644
--- a/compiler-rt/test/asan/TestCases/invalid-free.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-free.cpp
@@ -14,9 +14,9 @@ int main(int argc, char **argv) {
   int res = x[argc];
   free(x + 5);  // BOOM
   // CHECK: AddressSanitizer: attempting free on address{{.*}}in thread T0
-  // CHECK: invalid-free.cc:[[@LINE-2]]
+  // CHECK: invalid-free.cpp:[[@LINE-2]]
   // CHECK: is located 5 bytes inside of 10-byte region
   // CHECK: allocated by thread T0 here:
-  // MALLOC-CTX: invalid-free.cc:[[@LINE-8]]
+  // MALLOC-CTX: invalid-free.cpp:[[@LINE-8]]
   return res;
 }
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-errors.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-errors.cpp
index 0690d40d226..7b1479e2d05 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-errors.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-errors.cpp
@@ -23,82 +23,82 @@ int main() {
   char *heap2 = (char *)malloc(42);
 
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1, heap2);
   free(heap1);
   free(heap2);
 
   heap1 = (char *)malloc(1024);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1, heap1 + 1025);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1 + 1024, heap1 + 1025);
   free(heap1);
 
   heap1 = (char *)malloc(4096);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1, heap1 + 4097);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1, 0);
 
   // Global variables.
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(&global1[0], &global2[10]);
 
   char *p = &small_global[0];
   foo(p, p); // OK
   foo(p, p + 7); // OK
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, p + 8);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p - 1, p);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, p - 1);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p - 1, p + 8);
 
   p = &large_global[0];
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p - 1, p);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, p - 1);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, &global1[0]);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, &small_global[0]);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(p, 0);
 
   // Stack variables.
   char stack1, stack2;
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(&stack1, &stack2);
 
   // Mixtures.
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(heap1, &stack1);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
   foo(heap1, &global1[0]);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
   foo(&stack1, &global1[0]);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-compare-errors.cpp:[[@LINE+1]]
   foo(&stack1, 0);
 
   free(heap1);
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-null.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-null.cpp
index 9f7f7b6f439..9f7f7b6f439 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-null.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-null.cpp
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-success.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-success.cpp
index d0d92265f00..d0d92265f00 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-success.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-compare-success.cpp
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-errors.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-errors.cpp
index 20aaebeb48e..535833d05c8 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-errors.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-errors.cpp
@@ -17,29 +17,29 @@ int main() {
   char *heap2 = (char *)malloc(42);
 
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(heap1, heap2);
 
   // Global variables.
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(&global1[0], &global2[10]);
 
   // Stack variables.
   char stack1, stack2;
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(&stack1, &stack2);
 
   // Mixtures.
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(heap1, &stack1);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(heap1, &global1[0]);
   // CHECK: ERROR: AddressSanitizer: invalid-pointer-pair
-  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cc:[[@LINE+1]]
+  // CHECK: #{{[0-9]+ .*}} in main {{.*}}invalid-pointer-pairs-subtract-errors.cpp:[[@LINE+1]]
   foo(&stack1, &global1[0]);
 
   free(heap1);
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp
index 7ea120ed5c7..7ea120ed5c7 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp
diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs.cc b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs.cpp
index e1df151d136..8e57bdc0ccd 100644
--- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs.cc
+++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs.cpp
@@ -13,10 +13,10 @@ int f(char c, char *p, char *q) {
   // [[PTR1:0x[0-9a-f]+]] [[PTR2:0x[0-9a-f]+]]
   switch (c) {
   case 'g':
-    // CMP: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]
+    // CMP: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]]
     return p > q;
   case 's':
-    // SUB: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+1]]
+    // SUB: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+1]]
     return p - q;
   case 'k': {
     // OK-NOT: ERROR
@@ -26,7 +26,7 @@ int f(char c, char *p, char *q) {
   case 'f': {
     char *p3 = p + 20;
     free(p);
-    // FREE: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cc:[[@LINE+2]]
+    // FREE: #{{[0-9]+ .*}} in f({{char, char\*, char\*|char,char \*,char \*}}) {{.*}}invalid-pointer-pairs.cpp:[[@LINE+2]]
     // FREE: freed by thread
     return p < p3;
   }
diff --git a/compiler-rt/test/asan/TestCases/large_func_test.cc b/compiler-rt/test/asan/TestCases/large_func_test.cpp
index 1f5f7ccd5a6..776e193937d 100644
--- a/compiler-rt/test/asan/TestCases/large_func_test.cc
+++ b/compiler-rt/test/asan/TestCases/large_func_test.cpp
@@ -24,8 +24,8 @@ static void LargeFunction(int *x, int zero) {
   x[zero + 103]++;  // we should report this exact line
   // atos incorrectly extracts the symbol name for the static functions on
   // Darwin.
-  // CHECK-Linux:  {{#0 0x.* in LargeFunction.*large_func_test.cc:}}[[@LINE-3]]
-  // CHECK-Darwin: {{#0 0x.* in .*LargeFunction.*large_func_test.cc}}:[[@LINE-4]]
+  // CHECK-Linux:  {{#0 0x.* in LargeFunction.*large_func_test.cpp:}}[[@LINE-3]]
+  // CHECK-Darwin: {{#0 0x.* in .*LargeFunction.*large_func_test.cpp}}:[[@LINE-4]]
 
   x[10]++;
   x[11]++;
@@ -42,11 +42,11 @@ static void LargeFunction(int *x, int zero) {
 int main(int argc, char **argv) {
   int *x = new int[100];
   LargeFunction(x, argc - 1);
-  // CHECK: {{    #1 0x.* in main .*large_func_test.cc:}}[[@LINE-1]]
+  // CHECK: {{    #1 0x.* in main .*large_func_test.cpp:}}[[@LINE-1]]
   // CHECK: {{0x.* is located 12 bytes to the right of 400-byte region}}
   // CHECK: {{allocated by thread T0 here:}}
   // CHECK-Linux: {{    #0 0x.* in operator new.*}}
   // CHECK-Darwin: {{    #0 0x.* in .*_Zna.*}}
-  // CHECK: {{    #1 0x.* in main .*large_func_test.cc:}}[[@LINE-7]]
+  // CHECK: {{    #1 0x.* in main .*large_func_test.cpp:}}[[@LINE-7]]
   delete[] x;
 }
diff --git a/compiler-rt/test/asan/TestCases/log-path_test.cc b/compiler-rt/test/asan/TestCases/log-path_test.cpp
index fd33a31d6df..fd33a31d6df 100644
--- a/compiler-rt/test/asan/TestCases/log-path_test.cc
+++ b/compiler-rt/test/asan/TestCases/log-path_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/longjmp.cc b/compiler-rt/test/asan/TestCases/longjmp.cpp
index 8e9f2ae195c..8e9f2ae195c 100644
--- a/compiler-rt/test/asan/TestCases/longjmp.cc
+++ b/compiler-rt/test/asan/TestCases/longjmp.cpp
diff --git a/compiler-rt/test/asan/TestCases/lsan_annotations.cc b/compiler-rt/test/asan/TestCases/lsan_annotations.cpp
index f52b0ff66a8..f52b0ff66a8 100644
--- a/compiler-rt/test/asan/TestCases/lsan_annotations.cc
+++ b/compiler-rt/test/asan/TestCases/lsan_annotations.cpp
diff --git a/compiler-rt/test/asan/TestCases/malloc-size-too-big.cc b/compiler-rt/test/asan/TestCases/malloc-size-too-big.cpp
index f41b7ef75d7..71d6a3e7148 100644
--- a/compiler-rt/test/asan/TestCases/malloc-size-too-big.cc
+++ b/compiler-rt/test/asan/TestCases/malloc-size-too-big.cpp
@@ -18,7 +18,7 @@ int main() {
   void *p = malloc(kMaxAllowedMallocSizePlusOne);
   // CHECK: {{ERROR: AddressSanitizer: requested allocation size .* \(.* after adjustments for alignment, red zones etc\.\) exceeds maximum supported size}}
   // CHECK: {{#0 0x.* in .*malloc}}
-  // CHECK: {{#1 0x.* in main .*malloc-size-too-big.cc:}}[[@LINE-3]]
+  // CHECK: {{#1 0x.* in main .*malloc-size-too-big.cpp:}}[[@LINE-3]]
   // CHECK: SUMMARY: AddressSanitizer: allocation-size-too-big
 
   printf("malloc returned: %zu\n", (size_t)p);
diff --git a/compiler-rt/test/asan/TestCases/malloc_context_size.cc b/compiler-rt/test/asan/TestCases/malloc_context_size.cpp
index c753a3a5d2b..65ef2781ca8 100644
--- a/compiler-rt/test/asan/TestCases/malloc_context_size.cc
+++ b/compiler-rt/test/asan/TestCases/malloc_context_size.cpp
@@ -22,6 +22,6 @@ int main() {
 
   // TWO: previously allocated by thread T{{.*}} here:
   // TWO-NEXT: #0 0x{{.*}}
-  // TWO-NEXT: #1 0x{{.*}} in main {{.*}}malloc_context_size.cc
+  // TWO-NEXT: #1 0x{{.*}} in main {{.*}}malloc_context_size.cpp
   // TWO: SUMMARY: AddressSanitizer: heap-use-after-free
 }
diff --git a/compiler-rt/test/asan/TestCases/malloc_fill.cc b/compiler-rt/test/asan/TestCases/malloc_fill.cpp
index c897bbbc8cd..c897bbbc8cd 100644
--- a/compiler-rt/test/asan/TestCases/malloc_fill.cc
+++ b/compiler-rt/test/asan/TestCases/malloc_fill.cpp
diff --git a/compiler-rt/test/asan/TestCases/max_redzone.cc b/compiler-rt/test/asan/TestCases/max_redzone.cpp
index 99c886d1e68..99c886d1e68 100644
--- a/compiler-rt/test/asan/TestCases/max_redzone.cc
+++ b/compiler-rt/test/asan/TestCases/max_redzone.cpp
diff --git a/compiler-rt/test/asan/TestCases/memcmp_strict_test.cc b/compiler-rt/test/asan/TestCases/memcmp_strict_test.cpp
index 61ffe8b03e5..61ffe8b03e5 100644
--- a/compiler-rt/test/asan/TestCases/memcmp_strict_test.cc
+++ b/compiler-rt/test/asan/TestCases/memcmp_strict_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/memcmp_test.cc b/compiler-rt/test/asan/TestCases/memcmp_test.cpp
index e666b6d162b..e666b6d162b 100644
--- a/compiler-rt/test/asan/TestCases/memcmp_test.cc
+++ b/compiler-rt/test/asan/TestCases/memcmp_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/memset_test.cc b/compiler-rt/test/asan/TestCases/memset_test.cpp
index 0530c8483d7..0530c8483d7 100644
--- a/compiler-rt/test/asan/TestCases/memset_test.cc
+++ b/compiler-rt/test/asan/TestCases/memset_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/null_deref.cc b/compiler-rt/test/asan/TestCases/null_deref.cpp
index 222c526fdc1..a8947a43780 100644
--- a/compiler-rt/test/asan/TestCases/null_deref.cc
+++ b/compiler-rt/test/asan/TestCases/null_deref.cpp
@@ -15,10 +15,10 @@ void NullDeref(int *ptr) {
   ptr[10]++;  // BOOM
   // atos on Mac cannot extract the symbol name correctly. Also, on FreeBSD 9.2
   // the demangling function rejects local names with 'L' in front of them.
-  // CHECK: {{    #0 0x.* in .*NullDeref.*null_deref.cc}}
+  // CHECK: {{    #0 0x.* in .*NullDeref.*null_deref.cpp}}
 }
 int main() {
   NullDeref((int*)0);
-  // CHECK: {{    #1 0x.* in main.*null_deref.cc}}
+  // CHECK: {{    #1 0x.* in main.*null_deref.cpp}}
   // CHECK: AddressSanitizer can not provide additional info.
 }
diff --git a/compiler-rt/test/asan/TestCases/on_error_callback.cc b/compiler-rt/test/asan/TestCases/on_error_callback.cpp
index f37d1eb7f7f..f37d1eb7f7f 100644
--- a/compiler-rt/test/asan/TestCases/on_error_callback.cc
+++ b/compiler-rt/test/asan/TestCases/on_error_callback.cpp
diff --git a/compiler-rt/test/asan/TestCases/partial_right.cc b/compiler-rt/test/asan/TestCases/partial_right.cpp
index b60c1a59763..b60c1a59763 100644
--- a/compiler-rt/test/asan/TestCases/partial_right.cc
+++ b/compiler-rt/test/asan/TestCases/partial_right.cpp
diff --git a/compiler-rt/test/asan/TestCases/pass-object-byval.cc b/compiler-rt/test/asan/TestCases/pass-object-byval.cpp
index f9191c53d70..f9191c53d70 100644
--- a/compiler-rt/test/asan/TestCases/pass-object-byval.cc
+++ b/compiler-rt/test/asan/TestCases/pass-object-byval.cpp
diff --git a/compiler-rt/test/asan/TestCases/pass-struct-byval-uar.cc b/compiler-rt/test/asan/TestCases/pass-struct-byval-uar.cpp
index aa6fa579e18..aa6fa579e18 100644
--- a/compiler-rt/test/asan/TestCases/pass-struct-byval-uar.cc
+++ b/compiler-rt/test/asan/TestCases/pass-struct-byval-uar.cpp
diff --git a/compiler-rt/test/asan/TestCases/pass-struct-byval.cc b/compiler-rt/test/asan/TestCases/pass-struct-byval.cpp
index ba49eccf41c..ba49eccf41c 100644
--- a/compiler-rt/test/asan/TestCases/pass-struct-byval.cc
+++ b/compiler-rt/test/asan/TestCases/pass-struct-byval.cpp
diff --git a/compiler-rt/test/asan/TestCases/poison_partial.cc b/compiler-rt/test/asan/TestCases/poison_partial.cpp
index 3a1b4199945..3a1b4199945 100644
--- a/compiler-rt/test/asan/TestCases/poison_partial.cc
+++ b/compiler-rt/test/asan/TestCases/poison_partial.cpp
diff --git a/compiler-rt/test/asan/TestCases/pr33372.cc b/compiler-rt/test/asan/TestCases/pr33372.cpp
index a4b606e025c..a4b606e025c 100644
--- a/compiler-rt/test/asan/TestCases/pr33372.cc
+++ b/compiler-rt/test/asan/TestCases/pr33372.cpp
diff --git a/compiler-rt/test/asan/TestCases/print_summary.cc b/compiler-rt/test/asan/TestCases/print_summary.cpp
index 3983ebc6857..f3f7697056e 100644
--- a/compiler-rt/test/asan/TestCases/print_summary.cc
+++ b/compiler-rt/test/asan/TestCases/print_summary.cpp
@@ -8,7 +8,7 @@ int main() {
   delete[] x;
   return x[0];
   // SOURCE: ERROR: AddressSanitizer: heap-use-after-free
-  // SOURCE: SUMMARY: AddressSanitizer: heap-use-after-free {{.*}}print_summary.cc:[[@LINE-2]]{{.*}} main
+  // SOURCE: SUMMARY: AddressSanitizer: heap-use-after-free {{.*}}print_summary.cpp:[[@LINE-2]]{{.*}} main
   // MODULE: ERROR: AddressSanitizer: heap-use-after-free
   // MODULE: SUMMARY: AddressSanitizer: heap-use-after-free ({{.*}}+0x{{.*}})
   // MISSING: ERROR: AddressSanitizer: heap-use-after-free
diff --git a/compiler-rt/test/asan/TestCases/realloc.cc b/compiler-rt/test/asan/TestCases/realloc.cpp
index fcf383b1a73..fcf383b1a73 100644
--- a/compiler-rt/test/asan/TestCases/realloc.cc
+++ b/compiler-rt/test/asan/TestCases/realloc.cpp
diff --git a/compiler-rt/test/asan/TestCases/scariness_score_test.cc b/compiler-rt/test/asan/TestCases/scariness_score_test.cpp
index fb174eb52b2..fb174eb52b2 100644
--- a/compiler-rt/test/asan/TestCases/scariness_score_test.cc
+++ b/compiler-rt/test/asan/TestCases/scariness_score_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/small_memcpy_test.cc b/compiler-rt/test/asan/TestCases/small_memcpy_test.cpp
index ef0ac35b8a2..ef0ac35b8a2 100644
--- a/compiler-rt/test/asan/TestCases/small_memcpy_test.cc
+++ b/compiler-rt/test/asan/TestCases/small_memcpy_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/speculative_load.cc b/compiler-rt/test/asan/TestCases/speculative_load.cpp
index fdf70eb3976..fdf70eb3976 100644
--- a/compiler-rt/test/asan/TestCases/speculative_load.cc
+++ b/compiler-rt/test/asan/TestCases/speculative_load.cpp
diff --git a/compiler-rt/test/asan/TestCases/speculative_load2.cc b/compiler-rt/test/asan/TestCases/speculative_load2.cpp
index 51051eb2b75..51051eb2b75 100644
--- a/compiler-rt/test/asan/TestCases/speculative_load2.cc
+++ b/compiler-rt/test/asan/TestCases/speculative_load2.cpp
diff --git a/compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cc b/compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cpp
index 0077663d6a1..0077663d6a1 100644
--- a/compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cc
+++ b/compiler-rt/test/asan/TestCases/stack-buffer-overflow-with-position.cpp
diff --git a/compiler-rt/test/asan/TestCases/stack-buffer-overflow.cc b/compiler-rt/test/asan/TestCases/stack-buffer-overflow.cpp
index bd0c4772cc8..07cf39433b4 100644
--- a/compiler-rt/test/asan/TestCases/stack-buffer-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/stack-buffer-overflow.cpp
@@ -9,8 +9,8 @@ int main(int argc, char **argv) {
   memset(x, 0, 10);
   int res = x[argc * 10];  // BOOOM
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*stack-buffer-overflow.cc:}}[[@LINE-2]]
+  // CHECK: {{    #0 0x.* in main .*stack-buffer-overflow.cpp:}}[[@LINE-2]]
   // CHECK: {{Address 0x.* is located in stack of thread T0 at offset}}
-  // CHECK-NEXT: in{{.*}}main{{.*}}stack-buffer-overflow.cc
+  // CHECK-NEXT: in{{.*}}main{{.*}}stack-buffer-overflow.cpp
   return res;
 }
diff --git a/compiler-rt/test/asan/TestCases/stack-frame-demangle.cc b/compiler-rt/test/asan/TestCases/stack-frame-demangle.cpp
index 11a8b38e672..11a8b38e672 100644
--- a/compiler-rt/test/asan/TestCases/stack-frame-demangle.cc
+++ b/compiler-rt/test/asan/TestCases/stack-frame-demangle.cpp
diff --git a/compiler-rt/test/asan/TestCases/stack-oob-frames.cc b/compiler-rt/test/asan/TestCases/stack-oob-frames.cpp
index 3b5d511b268..3b5d511b268 100644
--- a/compiler-rt/test/asan/TestCases/stack-oob-frames.cc
+++ b/compiler-rt/test/asan/TestCases/stack-oob-frames.cpp
diff --git a/compiler-rt/test/asan/TestCases/strcat-overlap.cc b/compiler-rt/test/asan/TestCases/strcat-overlap.cpp
index 5539b130f4e..d3dd2a7c034 100644
--- a/compiler-rt/test/asan/TestCases/strcat-overlap.cc
+++ b/compiler-rt/test/asan/TestCases/strcat-overlap.cpp
@@ -43,8 +43,8 @@ __attribute__((noinline)) void bad_function() {
   // CHECK: strcat-param-overlap: memory ranges
   // CHECK: [{{0x.*,[ ]*0x.*}}) and [{{0x.*,[ ]*0x.*}}) overlap
   // CHECK: {{#0 0x.* in .*strcat}}
-  // CHECK: {{#1 0x.* in bad_function.*strcat-overlap.cc:}}[[@LINE+2]]
-  // CHECK: {{#2 0x.* in main .*strcat-overlap.cc:}}[[@LINE+5]]
+  // CHECK: {{#1 0x.* in bad_function.*strcat-overlap.cpp:}}[[@LINE+2]]
+  // CHECK: {{#2 0x.* in main .*strcat-overlap.cpp:}}[[@LINE+5]]
   strcat(buffer, buffer + 1); // BOOM
 }
 
diff --git a/compiler-rt/test/asan/TestCases/strcpy-overlap.cc b/compiler-rt/test/asan/TestCases/strcpy-overlap.cpp
index 53b77e13d91..36f1ec4da4f 100644
--- a/compiler-rt/test/asan/TestCases/strcpy-overlap.cc
+++ b/compiler-rt/test/asan/TestCases/strcpy-overlap.cpp
@@ -37,8 +37,8 @@ __attribute__((noinline)) void bad_function() {
   // CHECK: strcpy-param-overlap: memory ranges
   // CHECK: [{{0x.*,[ ]*0x.*}}) and [{{0x.*,[ ]*0x.*}}) overlap
   // CHECK: {{#0 0x.* in .*strcpy}}
-  // CHECK: {{#1 0x.* in bad_function.*strcpy-overlap.cc:}}[[@LINE+2]]
-  // CHECK: {{#2 0x.* in main .*strcpy-overlap.cc:}}[[@LINE+5]]
+  // CHECK: {{#1 0x.* in bad_function.*strcpy-overlap.cpp:}}[[@LINE+2]]
+  // CHECK: {{#2 0x.* in main .*strcpy-overlap.cpp:}}[[@LINE+5]]
   strcpy(buffer, buffer + 1); // BOOM
 }
 
diff --git a/compiler-rt/test/asan/TestCases/strdup_oob_test.cc b/compiler-rt/test/asan/TestCases/strdup_oob_test.cpp
index e251dfcb436..14791e46d3a 100644
--- a/compiler-rt/test/asan/TestCases/strdup_oob_test.cc
+++ b/compiler-rt/test/asan/TestCases/strdup_oob_test.cpp
@@ -21,11 +21,11 @@ int main(int argc, char **argv) {
   char *copy = strdup(kString);
   int x = copy[4 + argc];  // BOOM
   // CHECK: AddressSanitizer: heap-buffer-overflow
-  // CHECK: #0 {{.*}}main {{.*}}strdup_oob_test.cc:[[@LINE-2]]
+  // CHECK: #0 {{.*}}main {{.*}}strdup_oob_test.cpp:[[@LINE-2]]
   // CHECK-LABEL: allocated by thread T{{.*}} here:
   // CHECK: #{{[01]}} {{.*}}strdup
-  // CHECK: #{{.*}}main {{.*}}strdup_oob_test.cc:[[@LINE-6]]
+  // CHECK: #{{.*}}main {{.*}}strdup_oob_test.cpp:[[@LINE-6]]
   // CHECK-LABEL: SUMMARY
-  // CHECK: strdup_oob_test.cc:[[@LINE-7]]
+  // CHECK: strdup_oob_test.cpp:[[@LINE-7]]
   return x;
 }
diff --git a/compiler-rt/test/asan/TestCases/strncat-overlap.cc b/compiler-rt/test/asan/TestCases/strncat-overlap.cpp
index 959b783d263..9e6ad5914ef 100644
--- a/compiler-rt/test/asan/TestCases/strncat-overlap.cc
+++ b/compiler-rt/test/asan/TestCases/strncat-overlap.cpp
@@ -37,8 +37,8 @@ __attribute__((noinline)) void bad_function() {
   // CHECK: strncat-param-overlap: memory ranges
   // CHECK: [{{0x.*,[ ]*0x.*}}) and [{{0x.*,[ ]*0x.*}}) overlap
   // CHECK: {{#0 0x.* in .*strncat}}
-  // CHECK: {{#1 0x.* in bad_function.*strncat-overlap.cc:}}[[@LINE+2]]
-  // CHECK: {{#2 0x.* in main .*strncat-overlap.cc:}}[[@LINE+5]]
+  // CHECK: {{#1 0x.* in bad_function.*strncat-overlap.cpp:}}[[@LINE+2]]
+  // CHECK: {{#2 0x.* in main .*strncat-overlap.cpp:}}[[@LINE+5]]
   strncat(buffer, buffer + 1, 3); // BOOM
 }
 
diff --git a/compiler-rt/test/asan/TestCases/strncpy-overflow.cc b/compiler-rt/test/asan/TestCases/strncpy-overflow.cpp
index 7da9a8ff8ea..3047b7f8ad0 100644
--- a/compiler-rt/test/asan/TestCases/strncpy-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/strncpy-overflow.cpp
@@ -16,14 +16,14 @@ int main(int argc, char **argv) {
   // CHECK: {{WRITE of size 10 at 0x.* thread T0}}
   // CHECK-Linux: {{    #0 0x.* in .*strncpy}}
   // CHECK-Darwin: {{    #0 0x.* in wrap_strncpy}}
-  // CHECK: {{    #1 0x.* in main .*strncpy-overflow.cc:}}[[@LINE-4]]
+  // CHECK: {{    #1 0x.* in main .*strncpy-overflow.cpp:}}[[@LINE-4]]
   // CHECK: {{0x.* is located 0 bytes to the right of 9-byte region}}
   // CHECK: {{allocated by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in .*malloc}}
-  // CHECK-Linux: {{    #1 0x.* in main .*strncpy-overflow.cc:}}[[@LINE-10]]
+  // CHECK-Linux: {{    #1 0x.* in main .*strncpy-overflow.cpp:}}[[@LINE-10]]
 
   // CHECK-Darwin: {{    #0 0x.* in wrap_malloc.*}}
-  // CHECK-Darwin: {{    #1 0x.* in main .*strncpy-overflow.cc:}}[[@LINE-13]]
+  // CHECK-Darwin: {{    #1 0x.* in main .*strncpy-overflow.cpp:}}[[@LINE-13]]
   return short_buffer[8];
 }
diff --git a/compiler-rt/test/asan/TestCases/strncpy-overlap.cc b/compiler-rt/test/asan/TestCases/strncpy-overlap.cpp
index d7052cb49dc..f855b6af3bb 100644
--- a/compiler-rt/test/asan/TestCases/strncpy-overlap.cc
+++ b/compiler-rt/test/asan/TestCases/strncpy-overlap.cpp
@@ -37,8 +37,8 @@ __attribute__((noinline)) void bad_function() {
   // CHECK: strncpy-param-overlap: memory ranges
   // CHECK: [{{0x.*,[ ]*0x.*}}) and [{{0x.*,[ ]*0x.*}}) overlap
   // CHECK: {{#0 0x.* in .*strncpy}}
-  // CHECK: {{#1 0x.* in bad_function.*strncpy-overlap.cc:}}[[@LINE+2]]
-  // CHECK: {{#2 0x.* in main .*strncpy-overlap.cc:}}[[@LINE+5]]
+  // CHECK: {{#1 0x.* in bad_function.*strncpy-overlap.cpp:}}[[@LINE+2]]
+  // CHECK: {{#2 0x.* in main .*strncpy-overlap.cpp:}}[[@LINE+5]]
   strncpy(buffer, buffer + 1, 5); // BOOM
 }
 
diff --git a/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cc b/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp
index 3f6d239257d..3f6d239257d 100644
--- a/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cc
+++ b/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp
diff --git a/compiler-rt/test/asan/TestCases/suppressions-function.cc b/compiler-rt/test/asan/TestCases/suppressions-function.cpp
index 510a9bc5bb5..510a9bc5bb5 100644
--- a/compiler-rt/test/asan/TestCases/suppressions-function.cc
+++ b/compiler-rt/test/asan/TestCases/suppressions-function.cpp
diff --git a/compiler-rt/test/asan/TestCases/suppressions-interceptor.cc b/compiler-rt/test/asan/TestCases/suppressions-interceptor.cpp
index e44ccb8e652..e44ccb8e652 100644
--- a/compiler-rt/test/asan/TestCases/suppressions-interceptor.cc
+++ b/compiler-rt/test/asan/TestCases/suppressions-interceptor.cpp
diff --git a/compiler-rt/test/asan/TestCases/suppressions-library.cc b/compiler-rt/test/asan/TestCases/suppressions-library.cpp
index 181ed75826c..181ed75826c 100644
--- a/compiler-rt/test/asan/TestCases/suppressions-library.cc
+++ b/compiler-rt/test/asan/TestCases/suppressions-library.cpp
diff --git a/compiler-rt/test/asan/TestCases/throw_call_test.cc b/compiler-rt/test/asan/TestCases/throw_call_test.cpp
index 20a7c0b7660..20a7c0b7660 100644
--- a/compiler-rt/test/asan/TestCases/throw_call_test.cc
+++ b/compiler-rt/test/asan/TestCases/throw_call_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/throw_catch.cc b/compiler-rt/test/asan/TestCases/throw_catch.cpp
index d7f00ea9e19..d7f00ea9e19 100644
--- a/compiler-rt/test/asan/TestCases/throw_catch.cc
+++ b/compiler-rt/test/asan/TestCases/throw_catch.cpp
diff --git a/compiler-rt/test/asan/TestCases/throw_invoke_test.cc b/compiler-rt/test/asan/TestCases/throw_invoke_test.cpp
index bbfa1c7b95c..bbfa1c7b95c 100644
--- a/compiler-rt/test/asan/TestCases/throw_invoke_test.cc
+++ b/compiler-rt/test/asan/TestCases/throw_invoke_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/time_interceptor.cc b/compiler-rt/test/asan/TestCases/time_interceptor.cpp
index f78af1056af..f78af1056af 100644
--- a/compiler-rt/test/asan/TestCases/time_interceptor.cc
+++ b/compiler-rt/test/asan/TestCases/time_interceptor.cpp
diff --git a/compiler-rt/test/asan/TestCases/uar_and_exceptions.cc b/compiler-rt/test/asan/TestCases/uar_and_exceptions.cpp
index 2357ae803ac..2357ae803ac 100644
--- a/compiler-rt/test/asan/TestCases/uar_and_exceptions.cc
+++ b/compiler-rt/test/asan/TestCases/uar_and_exceptions.cpp
diff --git a/compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cc b/compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cpp
index f1b1d0d457e..fa8d7becfcb 100644
--- a/compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cc
+++ b/compiler-rt/test/asan/TestCases/unaligned_loads_and_stores.cpp
@@ -23,29 +23,29 @@ int main(int argc, char **argv) {
   switch (argv[1][0]) {
     case 'A': res = __sanitizer_unaligned_load16(x + 15); break;
 //  CHECK-A ERROR: AddressSanitizer: heap-buffer-overflow on address
-//  CHECK-A: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-2]]
+//  CHECK-A: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-2]]
 //  CHECK-A: is located 0 bytes to the right of 16-byte region
     case 'B': res = __sanitizer_unaligned_load32(x + 14); break;
-//  CHECK-B: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-B: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'C': res = __sanitizer_unaligned_load32(x + 13); break;
-//  CHECK-C: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-C: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'D': res = __sanitizer_unaligned_load64(x + 15); break;
-//  CHECK-D: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-D: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'E': res = __sanitizer_unaligned_load64(x + 9); break;
-//  CHECK-E: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-E: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
 
     case 'K': __sanitizer_unaligned_store16(x + 15, 0); break;
 //  CHECK-K ERROR: AddressSanitizer: heap-buffer-overflow on address
-//  CHECK-K: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-2]]
+//  CHECK-K: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-2]]
 //  CHECK-K: is located 0 bytes to the right of 16-byte region
     case 'L': __sanitizer_unaligned_store32(x + 15, 0); break;
-//  CHECK-L: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-L: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'M': __sanitizer_unaligned_store32(x + 13, 0); break;
-//  CHECK-M: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-M: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'N': __sanitizer_unaligned_store64(x + 10, 0); break;
-//  CHECK-N: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-N: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
     case 'O': __sanitizer_unaligned_store64(x + 14, 0); break;
-//  CHECK-O: main{{.*}}unaligned_loads_and_stores.cc:[[@LINE-1]]
+//  CHECK-O: main{{.*}}unaligned_loads_and_stores.cpp:[[@LINE-1]]
   }
   delete x;
   return res;
diff --git a/compiler-rt/test/asan/TestCases/use-after-delete.cc b/compiler-rt/test/asan/TestCases/use-after-delete.cpp
index 44404cd181f..c72e0f7919a 100644
--- a/compiler-rt/test/asan/TestCases/use-after-delete.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-delete.cpp
@@ -12,17 +12,17 @@ int main() {
   // CHECK: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
   // CHECK:   {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*use-after-delete.cc:}}[[@LINE-4]]
+  // CHECK: {{    #0 0x.* in main .*use-after-delete.cpp:}}[[@LINE-4]]
   // CHECK: {{0x.* is located 5 bytes inside of 10-byte region .0x.*,0x.*}}
   // CHECK: {{freed by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in operator delete\[\]}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-delete.cc:}}[[@LINE-10]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-delete.cpp:}}[[@LINE-10]]
 
   // CHECK: {{previously allocated by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in operator new\[\]}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-delete.cc:}}[[@LINE-16]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-delete.cpp:}}[[@LINE-16]]
 
   // CHECK: Shadow byte legend (one shadow byte represents {{[0-9]+}} application bytes):
   // CHECK: Global redzone:
diff --git a/compiler-rt/test/asan/TestCases/use-after-free-right.cc b/compiler-rt/test/asan/TestCases/use-after-free-right.cpp
index d72370e72d8..c4ae2810c6b 100644
--- a/compiler-rt/test/asan/TestCases/use-after-free-right.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-free-right.cpp
@@ -15,21 +15,21 @@ int main() {
   // CHECK: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
   // CHECK:   {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
   // CHECK: {{WRITE of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*use-after-free-right.cc:}}[[@LINE-4]]
+  // CHECK: {{    #0 0x.* in main .*use-after-free-right.cpp:}}[[@LINE-4]]
   // CHECK: {{0x.* is located 0 bytes inside of 1-byte region .0x.*,0x.*}}
   // CHECK: {{freed by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in .*free}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free-right.cc:}}[[@LINE-10]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free-right.cpp:}}[[@LINE-10]]
 
   // CHECK-Darwin: {{    #0 0x.* in wrap_free}}
-  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free-right.cc:}}[[@LINE-13]]
+  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free-right.cpp:}}[[@LINE-13]]
 
   // CHECK: {{previously allocated by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in .*malloc}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free-right.cc:}}[[@LINE-19]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free-right.cpp:}}[[@LINE-19]]
 
   // CHECK-Darwin: {{    #0 0x.* in wrap_malloc.*}}
-  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free-right.cc:}}[[@LINE-22]]
+  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free-right.cpp:}}[[@LINE-22]]
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-free.cc b/compiler-rt/test/asan/TestCases/use-after-free.cpp
index a24c7d497c1..54cd32ddaa6 100644
--- a/compiler-rt/test/asan/TestCases/use-after-free.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-free.cpp
@@ -12,23 +12,23 @@ int main() {
   // CHECK: {{.*ERROR: AddressSanitizer: heap-use-after-free on address}}
   // CHECK:   {{0x.* at pc 0x.* bp 0x.* sp 0x.*}}
   // CHECK: {{READ of size 1 at 0x.* thread T0}}
-  // CHECK: {{    #0 0x.* in main .*use-after-free.cc:}}[[@LINE-4]]
+  // CHECK: {{    #0 0x.* in main .*use-after-free.cpp:}}[[@LINE-4]]
   // CHECK: {{0x.* is located 5 bytes inside of 10-byte region .0x.*,0x.*}}
   // CHECK: {{freed by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in .*free}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free.cc:}}[[@LINE-10]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free.cpp:}}[[@LINE-10]]
 
   // CHECK-Darwin: {{    #0 0x.* in wrap_free}}
-  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free.cc:}}[[@LINE-13]]
+  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free.cpp:}}[[@LINE-13]]
 
   // CHECK: {{previously allocated by thread T0 here:}}
 
   // CHECK-Linux: {{    #0 0x.* in .*malloc}}
-  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free.cc:}}[[@LINE-19]]
+  // CHECK-Linux: {{    #1 0x.* in main .*use-after-free.cpp:}}[[@LINE-19]]
 
   // CHECK-Darwin: {{    #0 0x.* in wrap_malloc.*}}
-  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free.cc:}}[[@LINE-22]]
+  // CHECK-Darwin: {{    #1 0x.* in main .*use-after-free.cpp:}}[[@LINE-22]]
   // CHECK: Shadow byte legend (one shadow byte represents {{[0-9]+}} application bytes):
   // CHECK: Global redzone:
   // CHECK: ASan internal:
diff --git a/compiler-rt/test/asan/TestCases/use-after-poison.cc b/compiler-rt/test/asan/TestCases/use-after-poison.cpp
index 9df042b6015..b32bb8cd23f 100644
--- a/compiler-rt/test/asan/TestCases/use-after-poison.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-poison.cpp
@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
   __asan_poison_memory_region(x, 16);
   int res = x[argc * 10];  // BOOOM
   // CHECK: ERROR: AddressSanitizer: use-after-poison
-  // CHECK: main{{.*}}use-after-poison.cc:[[@LINE-2]]
+  // CHECK: main{{.*}}use-after-poison.cpp:[[@LINE-2]]
   delete [] x;
   return res;
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-capture.cc b/compiler-rt/test/asan/TestCases/use-after-scope-capture.cpp
index 113ce353666..5e93dbb48eb 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-capture.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-capture.cpp
@@ -10,7 +10,7 @@ int main() {
     f = [&x]() {
       return x;  // BOOM
       // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-      // CHECK: #0 0x{{.*}} in {{.*}}use-after-scope-capture.cc:[[@LINE-2]]
+      // CHECK: #0 0x{{.*}} in {{.*}}use-after-scope-capture.cpp:[[@LINE-2]]
     };
   }
   return f();  // BOOM
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-conversion.cc b/compiler-rt/test/asan/TestCases/use-after-scope-conversion.cpp
index 99b845d07a1..99b845d07a1 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-conversion.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-conversion.cpp
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cc b/compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cpp
index 8cdfa6a1cd4..8d4f772c0ea 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-dtor-order.cpp
@@ -8,7 +8,7 @@ struct IntHolder {
   ~IntHolder() {
     printf("Value: %d\n", *val_);  // BOOM
     // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-    // CHECK:  #0 0x{{.*}} in IntHolder::~IntHolder{{.*}}.cc:[[@LINE-2]]
+    // CHECK:  #0 0x{{.*}} in IntHolder::~IntHolder{{.*}}.cpp:[[@LINE-2]]
   }
   void set(int *val) { val_ = val; }
   int *get() { return val_; }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-goto.cc b/compiler-rt/test/asan/TestCases/use-after-scope-goto.cpp
index 351cbe995ef..351cbe995ef 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-goto.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-goto.cpp
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-if.cc b/compiler-rt/test/asan/TestCases/use-after-scope-if.cpp
index 8180077a0cc..579008385fe 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-if.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-if.cpp
@@ -11,5 +11,5 @@ int main() {
   }
   return *p;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}.cpp:[[@LINE-2]]
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-inlined.cc b/compiler-rt/test/asan/TestCases/use-after-scope-inlined.cpp
index bed9814c8b7..ce72fa23685 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-inlined.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-inlined.cpp
@@ -20,7 +20,7 @@ int main(int argc, char *argv[]) {
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
   // CHECK: READ of size 4 at 0x{{.*}} thread T0
   // CHECK:   #0 0x{{.*}} in main
-  // CHECK:      {{.*}}use-after-scope-inlined.cc:[[@LINE-4]]
+  // CHECK:      {{.*}}use-after-scope-inlined.cpp:[[@LINE-4]]
   // CHECK: Address 0x{{.*}} is located in stack of thread T0 at offset [[OFFSET:[^ ]*]] in frame
   // CHECK:      {{.*}} in main
   // CHECK:   This frame has
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-loop-bug.cc b/compiler-rt/test/asan/TestCases/use-after-scope-loop-bug.cpp
index d4b12eca980..b5b02d7f101 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-loop-bug.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-loop-bug.cpp
@@ -11,7 +11,7 @@ int main() {
   }
   return *p;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-loop-bug.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-loop-bug.cpp:[[@LINE-2]]
   // CHECK: Address 0x{{.*}} is located in stack of thread T{{.*}} at offset [[OFFSET:[^ ]+]] in frame
   // {{\[}}[[OFFSET]], {{[0-9]+}}) 'x'
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-loop-removed.cc b/compiler-rt/test/asan/TestCases/use-after-scope-loop-removed.cpp
index 730bf3a3ebe..0e8944e93c8 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-loop-removed.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-loop-removed.cpp
@@ -12,7 +12,7 @@ int main() {
   }
   return *p;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-loop-removed.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-loop-removed.cpp:[[@LINE-2]]
   // CHECK: Address 0x{{.*}} is located in stack of thread T{{.*}} at offset [[OFFSET:[^ ]+]] in frame
   // {{\[}}[[OFFSET]], {{[0-9]+}}) 'x'
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-loop.cc b/compiler-rt/test/asan/TestCases/use-after-scope-loop.cpp
index d99761bc7a8..dcd6435aefc 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-loop.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-loop.cpp
@@ -10,5 +10,5 @@ int main() {
   }
   return **p;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK: #0 0x{{.*}} in main {{.*}}.cc:[[@LINE-2]]
+  // CHECK: #0 0x{{.*}} in main {{.*}}.cpp:[[@LINE-2]]
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-nobug.cc b/compiler-rt/test/asan/TestCases/use-after-scope-nobug.cpp
index cf471dc345f..cf471dc345f 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-nobug.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-nobug.cpp
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-temp.cc b/compiler-rt/test/asan/TestCases/use-after-scope-temp.cpp
index 4dcef59a2ff..b97f312b4ab 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-temp.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-temp.cpp
@@ -16,6 +16,6 @@ int main(int argc, char *argv[]) {
   save({argc});
   int x = saved->val;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-temp.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-temp.cpp:[[@LINE-2]]
   return x;
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-temp2.cc b/compiler-rt/test/asan/TestCases/use-after-scope-temp2.cpp
index 1ecd3cbe23f..99e4f2505ff 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-temp2.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-temp2.cpp
@@ -15,6 +15,6 @@ int main(int argc, char *argv[]) {
   saved = &IntHolder().Self();
   int x = saved->val;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-temp2.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope-temp2.cpp:[[@LINE-2]]
   return x;
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope-types.cc b/compiler-rt/test/asan/TestCases/use-after-scope-types.cpp
index ec6742bbb24..5afd3b1ef4e 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope-types.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope-types.cpp
@@ -41,7 +41,7 @@ template <class T> __attribute__((noinline)) void test() {
 
   ptr.Access();
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #{{[0-9]+}} 0x{{.*}} in {{(void )?test.*\((void)?\) .*}}use-after-scope-types.cc
+  // CHECK:  #{{[0-9]+}} 0x{{.*}} in {{(void )?test.*\((void)?\) .*}}use-after-scope-types.cpp
   // CHECK: Address 0x{{.*}} is located in stack of thread T{{.*}} at offset [[OFFSET:[^ ]+]] in frame
   // {{\[}}[[OFFSET]], {{[0-9]+}}) 'x'
 }
diff --git a/compiler-rt/test/asan/TestCases/use-after-scope.cc b/compiler-rt/test/asan/TestCases/use-after-scope.cpp
index 4c5998abe20..fdc937bb6f3 100644
--- a/compiler-rt/test/asan/TestCases/use-after-scope.cc
+++ b/compiler-rt/test/asan/TestCases/use-after-scope.cpp
@@ -14,7 +14,7 @@ int main() {
   }
   *p = 5;  // BOOM
   // CHECK: ERROR: AddressSanitizer: stack-use-after-scope
-  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope.cc:[[@LINE-2]]
+  // CHECK:  #0 0x{{.*}} in main {{.*}}use-after-scope.cpp:[[@LINE-2]]
   // CHECK: Address 0x{{.*}} is located in stack of thread T{{.*}} at offset [[OFFSET:[^ ]+]] in frame
   // {{\[}}[[OFFSET]], {{[0-9]+}}) 'x'
   return 0;
diff --git a/compiler-rt/test/asan/TestCases/verbose-log-path_test.cc b/compiler-rt/test/asan/TestCases/verbose-log-path_test.cpp
index 5407d15d6f6..5407d15d6f6 100644
--- a/compiler-rt/test/asan/TestCases/verbose-log-path_test.cc
+++ b/compiler-rt/test/asan/TestCases/verbose-log-path_test.cpp
diff --git a/compiler-rt/test/asan/TestCases/vla_chrome_testcase.cc b/compiler-rt/test/asan/TestCases/vla_chrome_testcase.cpp
index a8771800609..a8771800609 100644
--- a/compiler-rt/test/asan/TestCases/vla_chrome_testcase.cc
+++ b/compiler-rt/test/asan/TestCases/vla_chrome_testcase.cpp
diff --git a/compiler-rt/test/asan/TestCases/vla_condition_overflow.cc b/compiler-rt/test/asan/TestCases/vla_condition_overflow.cpp
index cf42d794e9d..cf42d794e9d 100644
--- a/compiler-rt/test/asan/TestCases/vla_condition_overflow.cc
+++ b/compiler-rt/test/asan/TestCases/vla_condition_overflow.cpp
diff --git a/compiler-rt/test/asan/TestCases/vla_loop_overfow.cc b/compiler-rt/test/asan/TestCases/vla_loop_overfow.cpp
index b6a5864c0f6..b6a5864c0f6 100644
--- a/compiler-rt/test/asan/TestCases/vla_loop_overfow.cc
+++ b/compiler-rt/test/asan/TestCases/vla_loop_overfow.cpp
diff --git a/compiler-rt/test/asan/TestCases/zero_page_pc.cc b/compiler-rt/test/asan/TestCases/zero_page_pc.cpp
index ba35df880ed..ba35df880ed 100644
--- a/compiler-rt/test/asan/TestCases/zero_page_pc.cc
+++ b/compiler-rt/test/asan/TestCases/zero_page_pc.cpp
diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index af0721ad1d1..2a8d93166f6 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -254,7 +254,7 @@ if config.host_os == 'Darwin':
       config.available_features.add('osx-autointerception')
       config.available_features.add('osx-ld64-live_support')
     else:
-      # The ASAN initialization-bug.cc test should XFAIL on OS X systems
+      # The ASAN initialization-bug.cpp test should XFAIL on OS X systems
       # older than El Capitan. By marking the test as being unsupported with
       # this "feature", we can pass the test on newer OS X versions and other
       # platforms.