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

Like r367463, but for test/msan.

llvm-svn: 367653

136 files changed, 78 insertions, 78 deletions

diff --git a/compiler-rt/test/msan/Linux/bzero.cc b/compiler-rt/test/msan/Linux/bzero.cpp
index cb319a6cfa1..cb319a6cfa1 100644
--- a/compiler-rt/test/msan/Linux/bzero.cc
+++ b/compiler-rt/test/msan/Linux/bzero.cpp
diff --git a/compiler-rt/test/msan/Linux/cmsghdr.cc b/compiler-rt/test/msan/Linux/cmsghdr.cpp
index daed1baad20..daed1baad20 100644
--- a/compiler-rt/test/msan/Linux/cmsghdr.cc
+++ b/compiler-rt/test/msan/Linux/cmsghdr.cpp
diff --git a/compiler-rt/test/msan/Linux/eventfd.cc b/compiler-rt/test/msan/Linux/eventfd.cpp
index 4399211258f..4399211258f 100644
--- a/compiler-rt/test/msan/Linux/eventfd.cc
+++ b/compiler-rt/test/msan/Linux/eventfd.cpp
diff --git a/compiler-rt/test/msan/Linux/fopencookie.cc b/compiler-rt/test/msan/Linux/fopencookie.cpp
index e5b8f936e0d..e5b8f936e0d 100644
--- a/compiler-rt/test/msan/Linux/fopencookie.cc
+++ b/compiler-rt/test/msan/Linux/fopencookie.cpp
diff --git a/compiler-rt/test/msan/Linux/forkpty.cc b/compiler-rt/test/msan/Linux/forkpty.cpp
index c5f09f0b843..c5f09f0b843 100644
--- a/compiler-rt/test/msan/Linux/forkpty.cc
+++ b/compiler-rt/test/msan/Linux/forkpty.cpp
diff --git a/compiler-rt/test/msan/Linux/getresid.cc b/compiler-rt/test/msan/Linux/getresid.cpp
index f3c0914b52f..f3c0914b52f 100644
--- a/compiler-rt/test/msan/Linux/getresid.cc
+++ b/compiler-rt/test/msan/Linux/getresid.cpp
diff --git a/compiler-rt/test/msan/Linux/glob.cc b/compiler-rt/test/msan/Linux/glob.cpp
index 1481861a08e..1481861a08e 100644
--- a/compiler-rt/test/msan/Linux/glob.cc
+++ b/compiler-rt/test/msan/Linux/glob.cpp
diff --git a/compiler-rt/test/msan/Linux/glob_altdirfunc.cc b/compiler-rt/test/msan/Linux/glob_altdirfunc.cpp
index cb7fe09cbc3..cb7fe09cbc3 100644
--- a/compiler-rt/test/msan/Linux/glob_altdirfunc.cc
+++ b/compiler-rt/test/msan/Linux/glob_altdirfunc.cpp
diff --git a/compiler-rt/test/msan/Linux/glob_nomatch.cc b/compiler-rt/test/msan/Linux/glob_nomatch.cpp
index fa132c81372..fa132c81372 100644
--- a/compiler-rt/test/msan/Linux/glob_nomatch.cc
+++ b/compiler-rt/test/msan/Linux/glob_nomatch.cpp
diff --git a/compiler-rt/test/msan/Linux/ioctl_sound.cc b/compiler-rt/test/msan/Linux/ioctl_sound.cpp
index fb36c52f2e7..fb36c52f2e7 100644
--- a/compiler-rt/test/msan/Linux/ioctl_sound.cc
+++ b/compiler-rt/test/msan/Linux/ioctl_sound.cpp
diff --git a/compiler-rt/test/msan/Linux/mallinfo.cc b/compiler-rt/test/msan/Linux/mallinfo.cpp
index b2021c5df3c..b2021c5df3c 100644
--- a/compiler-rt/test/msan/Linux/mallinfo.cc
+++ b/compiler-rt/test/msan/Linux/mallinfo.cpp
diff --git a/compiler-rt/test/msan/Linux/mincore.cc b/compiler-rt/test/msan/Linux/mincore.cpp
index 35f5713d431..35f5713d431 100644
--- a/compiler-rt/test/msan/Linux/mincore.cc
+++ b/compiler-rt/test/msan/Linux/mincore.cpp
diff --git a/compiler-rt/test/msan/Linux/name_to_handle_at.cc b/compiler-rt/test/msan/Linux/name_to_handle_at.cpp
index a8bc75fa2ae..a8bc75fa2ae 100644
--- a/compiler-rt/test/msan/Linux/name_to_handle_at.cc
+++ b/compiler-rt/test/msan/Linux/name_to_handle_at.cpp
diff --git a/compiler-rt/test/msan/Linux/obstack.cc b/compiler-rt/test/msan/Linux/obstack.cpp
index 0a81d8704f1..b328cc71f11 100644
--- a/compiler-rt/test/msan/Linux/obstack.cc
+++ b/compiler-rt/test/msan/Linux/obstack.cpp
@@ -30,7 +30,7 @@ int main(void) {
       __msan_check_mem_is_initialized(p, sizeof(data) + 1);
     }
     // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-    // CHECK: #0 0x{{.*}} in main{{.*}}obstack.cc:[[@LINE-3]]
+    // CHECK: #0 0x{{.*}} in main{{.*}}obstack.cpp:[[@LINE-3]]
 #endif
   }
   obstack_free(&obs, 0);
diff --git a/compiler-rt/test/msan/Linux/poll.cc b/compiler-rt/test/msan/Linux/poll.cpp
index 7870d18e038..7870d18e038 100644
--- a/compiler-rt/test/msan/Linux/poll.cc
+++ b/compiler-rt/test/msan/Linux/poll.cpp
diff --git a/compiler-rt/test/msan/Linux/process_vm_readv.cc b/compiler-rt/test/msan/Linux/process_vm_readv.cpp
index 0a0e0274b8a..0a0e0274b8a 100644
--- a/compiler-rt/test/msan/Linux/process_vm_readv.cc
+++ b/compiler-rt/test/msan/Linux/process_vm_readv.cpp
diff --git a/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp
index 61492ec3453..61492ec3453 100644
--- a/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc
+++ b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp
diff --git a/compiler-rt/test/msan/Linux/sendmsg.cc b/compiler-rt/test/msan/Linux/sendmsg.cpp
index 91c3f64d7f2..91c3f64d7f2 100644
--- a/compiler-rt/test/msan/Linux/sendmsg.cc
+++ b/compiler-rt/test/msan/Linux/sendmsg.cpp
diff --git a/compiler-rt/test/msan/Linux/strerror_r.cc b/compiler-rt/test/msan/Linux/strerror_r.cpp
index aec653f9c02..aec653f9c02 100644
--- a/compiler-rt/test/msan/Linux/strerror_r.cc
+++ b/compiler-rt/test/msan/Linux/strerror_r.cpp
diff --git a/compiler-rt/test/msan/Linux/sunrpc.cc b/compiler-rt/test/msan/Linux/sunrpc.cpp
index edf49c2a5ce..8828bfd7e39 100644
--- a/compiler-rt/test/msan/Linux/sunrpc.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[]) {
 #endif
   bool_t res = FN(&xdrs, &x);
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{in main.*sunrpc.cc:}}[[@LINE-2]]
+  // CHECK: {{in main.*sunrpc.cpp:}}[[@LINE-2]]
   assert(res == TRUE);
   xdr_destroy(&xdrs);
 
diff --git a/compiler-rt/test/msan/Linux/sunrpc_bytes.cc b/compiler-rt/test/msan/Linux/sunrpc_bytes.cpp
index 7eb47e17849..7806e6e7c7d 100644
--- a/compiler-rt/test/msan/Linux/sunrpc_bytes.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc_bytes.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[]) {
   unsigned sz = 6;
   bool_t res = xdr_bytes(&xdrs, &sp, &sz, sizeof(s));
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{in main.*sunrpc_bytes.cc:}}[[@LINE-2]]
+  // CHECK: {{in main.*sunrpc_bytes.cpp:}}[[@LINE-2]]
   assert(res == TRUE);
   xdr_destroy(&xdrs);
 
diff --git a/compiler-rt/test/msan/Linux/sunrpc_string.cc b/compiler-rt/test/msan/Linux/sunrpc_string.cpp
index 723b8559226..76b53a7057c 100644
--- a/compiler-rt/test/msan/Linux/sunrpc_string.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc_string.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
   char *sp = s;
   bool_t res = xdr_string(&xdrs, &sp, sizeof(s));
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{in main.*sunrpc_string.cc:}}[[@LINE-2]]
+  // CHECK: {{in main.*sunrpc_string.cpp:}}[[@LINE-2]]
   assert(res == TRUE);
   xdr_destroy(&xdrs);
 
diff --git a/compiler-rt/test/msan/Linux/syscalls.cc b/compiler-rt/test/msan/Linux/syscalls.cpp
index c5ac3e27fa1..c5ac3e27fa1 100644
--- a/compiler-rt/test/msan/Linux/syscalls.cc
+++ b/compiler-rt/test/msan/Linux/syscalls.cpp
diff --git a/compiler-rt/test/msan/Linux/syscalls_sigaction.cc b/compiler-rt/test/msan/Linux/syscalls_sigaction.cpp
index 975ca2ba687..975ca2ba687 100644
--- a/compiler-rt/test/msan/Linux/syscalls_sigaction.cc
+++ b/compiler-rt/test/msan/Linux/syscalls_sigaction.cpp
diff --git a/compiler-rt/test/msan/Linux/tcgetattr.cc b/compiler-rt/test/msan/Linux/tcgetattr.cpp
index 454b7fd1537..454b7fd1537 100644
--- a/compiler-rt/test/msan/Linux/tcgetattr.cc
+++ b/compiler-rt/test/msan/Linux/tcgetattr.cpp
diff --git a/compiler-rt/test/msan/Linux/xattr.cc b/compiler-rt/test/msan/Linux/xattr.cpp
index 86cc2cd474d..86cc2cd474d 100644
--- a/compiler-rt/test/msan/Linux/xattr.cc
+++ b/compiler-rt/test/msan/Linux/xattr.cpp
diff --git a/compiler-rt/test/msan/__strxfrm_l.cc b/compiler-rt/test/msan/__strxfrm_l.cpp
index c4eb10efb3e..c4eb10efb3e 100644
--- a/compiler-rt/test/msan/__strxfrm_l.cc
+++ b/compiler-rt/test/msan/__strxfrm_l.cpp
diff --git a/compiler-rt/test/msan/alloca.cc b/compiler-rt/test/msan/alloca.cpp
index 3472361e4b0..3472361e4b0 100644
--- a/compiler-rt/test/msan/alloca.cc
+++ b/compiler-rt/test/msan/alloca.cpp
diff --git a/compiler-rt/test/msan/allocator_mapping.cc b/compiler-rt/test/msan/allocator_mapping.cpp
index 533128f9a0f..533128f9a0f 100644
--- a/compiler-rt/test/msan/allocator_mapping.cc
+++ b/compiler-rt/test/msan/allocator_mapping.cpp
diff --git a/compiler-rt/test/msan/backtrace.cc b/compiler-rt/test/msan/backtrace.cpp
index cde4e8fc1c9..cde4e8fc1c9 100644
--- a/compiler-rt/test/msan/backtrace.cc
+++ b/compiler-rt/test/msan/backtrace.cpp
diff --git a/compiler-rt/test/msan/chained_origin.cc b/compiler-rt/test/msan/chained_origin.cpp
index 7cab15284d2..c16b8792251 100644
--- a/compiler-rt/test/msan/chained_origin.cc
+++ b/compiler-rt/test/msan/chained_origin.cpp
@@ -47,21 +47,21 @@ int main(int argc, char *argv[]) {
 }
 
 // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-// CHECK: {{#0 .* in main.*chained_origin.cc:}}[[@LINE-4]]
+// CHECK: {{#0 .* in main.*chained_origin.cpp:}}[[@LINE-4]]
 
 // CHECK: Uninitialized value was stored to memory at
-// CHECK-FULL-STACK: {{#0 .* in fn_h.*chained_origin.cc:}}[[@LINE-19]]
-// CHECK-FULL-STACK: {{#1 .* in main.*chained_origin.cc:}}[[@LINE-9]]
-// CHECK-SHORT-STACK: {{#0 .* in fn_h.*chained_origin.cc:}}[[@LINE-21]]
+// CHECK-FULL-STACK: {{#0 .* in fn_h.*chained_origin.cpp:}}[[@LINE-19]]
+// CHECK-FULL-STACK: {{#1 .* in main.*chained_origin.cpp:}}[[@LINE-9]]
+// CHECK-SHORT-STACK: {{#0 .* in fn_h.*chained_origin.cpp:}}[[@LINE-21]]
 
 // CHECK: Uninitialized value was stored to memory at
-// CHECK-FULL-STACK: {{#0 .* in fn_g.*chained_origin.cc:}}[[@LINE-34]]
-// CHECK-FULL-STACK: {{#1 .* in fn_f.*chained_origin.cc:}}[[@LINE-30]]
-// CHECK-FULL-STACK: {{#2 .* in main.*chained_origin.cc:}}[[@LINE-16]]
-// CHECK-SHORT-STACK: {{#0 .* in fn_g.*chained_origin.cc:}}[[@LINE-37]]
+// CHECK-FULL-STACK: {{#0 .* in fn_g.*chained_origin.cpp:}}[[@LINE-34]]
+// CHECK-FULL-STACK: {{#1 .* in fn_f.*chained_origin.cpp:}}[[@LINE-30]]
+// CHECK-FULL-STACK: {{#2 .* in main.*chained_origin.cpp:}}[[@LINE-16]]
+// CHECK-SHORT-STACK: {{#0 .* in fn_g.*chained_origin.cpp:}}[[@LINE-37]]
 
 // CHECK-STACK: Uninitialized value was created by an allocation of 'z' in the stack frame of function 'main'
-// CHECK-STACK: {{#0 .* in main.*chained_origin.cc:}}[[@LINE-27]]
+// CHECK-STACK: {{#0 .* in main.*chained_origin.cpp:}}[[@LINE-27]]
 
 // CHECK-HEAP: Uninitialized value was created by a heap allocation
-// CHECK-HEAP: {{#1 .* in main.*chained_origin.cc:}}[[@LINE-28]]
+// CHECK-HEAP: {{#1 .* in main.*chained_origin.cpp:}}[[@LINE-28]]
diff --git a/compiler-rt/test/msan/chained_origin_empty_stack.cc b/compiler-rt/test/msan/chained_origin_empty_stack.cpp
index f1ed66b75e4..f1ed66b75e4 100644
--- a/compiler-rt/test/msan/chained_origin_empty_stack.cc
+++ b/compiler-rt/test/msan/chained_origin_empty_stack.cpp
diff --git a/compiler-rt/test/msan/chained_origin_limits.cc b/compiler-rt/test/msan/chained_origin_limits.cpp
index 9585889eb37..9585889eb37 100644
--- a/compiler-rt/test/msan/chained_origin_limits.cc
+++ b/compiler-rt/test/msan/chained_origin_limits.cpp
diff --git a/compiler-rt/test/msan/chained_origin_memcpy.cc b/compiler-rt/test/msan/chained_origin_memcpy.cpp
index a950a036ea1..47a0effb3cc 100644
--- a/compiler-rt/test/msan/chained_origin_memcpy.cc
+++ b/compiler-rt/test/msan/chained_origin_memcpy.cpp
@@ -46,17 +46,17 @@ int main(int argc, char *argv[]) {
 }
 
 // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-// CHECK: {{#0 .* in main .*chained_origin_memcpy.cc:}}[[@LINE-4]]
+// CHECK: {{#0 .* in main .*chained_origin_memcpy.cpp:}}[[@LINE-4]]
 
 // CHECK: Uninitialized value was stored to memory at
-// CHECK-FULL-STACK: {{#1 .* in fn_h.*chained_origin_memcpy.cc:}}[[@LINE-15]]
+// CHECK-FULL-STACK: {{#1 .* in fn_h.*chained_origin_memcpy.cpp:}}[[@LINE-15]]
 // CHECK-SHORT-STACK: {{#0 .* in __msan_memcpy.*msan_interceptors.cpp:}}
 
 // CHECK: Uninitialized value was stored to memory at
-// CHECK-FULL-STACK: {{#0 .* in fn_g.*chained_origin_memcpy.cc:}}[[@LINE-29]]
-// CHECK-FULL-STACK: {{#1 .* in fn_f.*chained_origin_memcpy.cc:}}[[@LINE-25]]
-// CHECK-SHORT-STACK: {{#0 .* in fn_g.*chained_origin_memcpy.cc:}}[[@LINE-31]]
+// CHECK-FULL-STACK: {{#0 .* in fn_g.*chained_origin_memcpy.cpp:}}[[@LINE-29]]
+// CHECK-FULL-STACK: {{#1 .* in fn_f.*chained_origin_memcpy.cpp:}}[[@LINE-25]]
+// CHECK-SHORT-STACK: {{#0 .* in fn_g.*chained_origin_memcpy.cpp:}}[[@LINE-31]]
 
 // CHECK-Z1: Uninitialized value was created by an allocation of 'z1' in the stack frame of function 'main'
 // CHECK-Z2: Uninitialized value was created by an allocation of 'z2' in the stack frame of function 'main'
-// CHECK: {{#0 .* in main.*chained_origin_memcpy.cc:}}[[@LINE-22]]
+// CHECK: {{#0 .* in main.*chained_origin_memcpy.cpp:}}[[@LINE-22]]
diff --git a/compiler-rt/test/msan/chained_origin_with_signals.cc b/compiler-rt/test/msan/chained_origin_with_signals.cpp
index 9c071569a2b..9c071569a2b 100644
--- a/compiler-rt/test/msan/chained_origin_with_signals.cc
+++ b/compiler-rt/test/msan/chained_origin_with_signals.cpp
diff --git a/compiler-rt/test/msan/check-handler.cc b/compiler-rt/test/msan/check-handler.cpp
index 4721f8c3068..4721f8c3068 100644
--- a/compiler-rt/test/msan/check-handler.cc
+++ b/compiler-rt/test/msan/check-handler.cpp
diff --git a/compiler-rt/test/msan/check_mem_is_initialized.cc b/compiler-rt/test/msan/check_mem_is_initialized.cpp
index e1d3b117e42..b8552376093 100644
--- a/compiler-rt/test/msan/check_mem_is_initialized.cc
+++ b/compiler-rt/test/msan/check_mem_is_initialized.cpp
@@ -24,10 +24,10 @@ int main(int argc, char **argv) {
 
   __msan_check_mem_is_initialized(p, sizeof(*p));
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*check_mem_is_initialized.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*check_mem_is_initialized.cpp:}}[[@LINE-2]]
 
   // CHECK-ORIGINS: Uninitialized value was created by a heap allocation
   // CHECK-ORIGINS: {{#0 0x.* in .*malloc}}
-  // CHECK-ORIGINS: {{#1 0x.* in main .*check_mem_is_initialized.cc:}}[[@LINE-8]]
+  // CHECK-ORIGINS: {{#1 0x.* in main .*check_mem_is_initialized.cpp:}}[[@LINE-8]]
   return 0;
 }
diff --git a/compiler-rt/test/msan/coverage-levels.cc b/compiler-rt/test/msan/coverage-levels.cpp
index 5ca3b717d04..5ca3b717d04 100644
--- a/compiler-rt/test/msan/coverage-levels.cc
+++ b/compiler-rt/test/msan/coverage-levels.cpp
diff --git a/compiler-rt/test/msan/ctermid.cc b/compiler-rt/test/msan/ctermid.cpp
index a2818e63068..a2818e63068 100644
--- a/compiler-rt/test/msan/ctermid.cc
+++ b/compiler-rt/test/msan/ctermid.cpp
diff --git a/compiler-rt/test/msan/cxa_atexit.cc b/compiler-rt/test/msan/cxa_atexit.cpp
index 70384b9c93f..70384b9c93f 100644
--- a/compiler-rt/test/msan/cxa_atexit.cc
+++ b/compiler-rt/test/msan/cxa_atexit.cpp
diff --git a/compiler-rt/test/msan/death-callback.cc b/compiler-rt/test/msan/death-callback.cpp
index 08cf2911b0f..08cf2911b0f 100644
--- a/compiler-rt/test/msan/death-callback.cc
+++ b/compiler-rt/test/msan/death-callback.cpp
diff --git a/compiler-rt/test/msan/default_blacklist.cc b/compiler-rt/test/msan/default_blacklist.cpp
index 32cc02257cb..32cc02257cb 100644
--- a/compiler-rt/test/msan/default_blacklist.cc
+++ b/compiler-rt/test/msan/default_blacklist.cpp
diff --git a/compiler-rt/test/msan/dlerror.cc b/compiler-rt/test/msan/dlerror.cpp
index d5510b65c4a..d5510b65c4a 100644
--- a/compiler-rt/test/msan/dlerror.cc
+++ b/compiler-rt/test/msan/dlerror.cpp
diff --git a/compiler-rt/test/msan/dlopen_executable.cc b/compiler-rt/test/msan/dlopen_executable.cpp
index ac8a14b9407..393e871f5dc 100644
--- a/compiler-rt/test/msan/dlopen_executable.cc
+++ b/compiler-rt/test/msan/dlopen_executable.cpp
@@ -13,5 +13,5 @@ int main(void) {
   assert(p && "failed to get handle to executable");
   return my_global;
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #0 {{.*}} in main{{.*}}dlopen_executable.cc:[[@LINE-2]]
+  // CHECK: #0 {{.*}} in main{{.*}}dlopen_executable.cpp:[[@LINE-2]]
 }
diff --git a/compiler-rt/test/msan/dso-origin.cc b/compiler-rt/test/msan/dso-origin.cpp
index 7f62449842c..4cc86dc44ec 100644
--- a/compiler-rt/test/msan/dso-origin.cc
+++ b/compiler-rt/test/msan/dso-origin.cpp
@@ -35,13 +35,13 @@ int main(int argc, char **argv) {
   delete x;
 
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in my_access .*dso-origin.cc:}}
-  // CHECK: {{#1 0x.* in main .*dso-origin.cc:}}[[@LINE-5]]
+  // CHECK: {{#0 0x.* in my_access .*dso-origin.cpp:}}
+  // CHECK: {{#1 0x.* in main .*dso-origin.cpp:}}[[@LINE-5]]
   // CHECK: Uninitialized value was created by a heap allocation
   // CHECK: {{#0 0x.* in .*malloc}}
-  // CHECK: {{#1 0x.* in my_alloc .*dso-origin.cc:}}
-  // CHECK: {{#2 0x.* in main .*dso-origin.cc:}}[[@LINE-10]]
-  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*dso-origin.cc:.* my_access}}
+  // CHECK: {{#1 0x.* in my_alloc .*dso-origin.cpp:}}
+  // CHECK: {{#2 0x.* in main .*dso-origin.cpp:}}[[@LINE-10]]
+  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*dso-origin.cpp:.* my_access}}
   return 0;
 }
 
diff --git a/compiler-rt/test/msan/dtor-base-access.cc b/compiler-rt/test/msan/dtor-base-access.cpp
index bed66fb621d..bed66fb621d 100644
--- a/compiler-rt/test/msan/dtor-base-access.cc
+++ b/compiler-rt/test/msan/dtor-base-access.cpp
diff --git a/compiler-rt/test/msan/dtor-bit-fields.cc b/compiler-rt/test/msan/dtor-bit-fields.cpp
index 4c6e322e636..4c6e322e636 100644
--- a/compiler-rt/test/msan/dtor-bit-fields.cc
+++ b/compiler-rt/test/msan/dtor-bit-fields.cpp
diff --git a/compiler-rt/test/msan/dtor-derived-class.cc b/compiler-rt/test/msan/dtor-derived-class.cpp
index 1f3db7f3337..1f3db7f3337 100644
--- a/compiler-rt/test/msan/dtor-derived-class.cc
+++ b/compiler-rt/test/msan/dtor-derived-class.cpp
diff --git a/compiler-rt/test/msan/dtor-member.cc b/compiler-rt/test/msan/dtor-member.cpp
index bf20221a363..bf20221a363 100644
--- a/compiler-rt/test/msan/dtor-member.cc
+++ b/compiler-rt/test/msan/dtor-member.cpp
diff --git a/compiler-rt/test/msan/dtor-multiple-inheritance-nontrivial-class-members.cc b/compiler-rt/test/msan/dtor-multiple-inheritance-nontrivial-class-members.cpp
index dd79e3cc6c5..dd79e3cc6c5 100644
--- a/compiler-rt/test/msan/dtor-multiple-inheritance-nontrivial-class-members.cc
+++ b/compiler-rt/test/msan/dtor-multiple-inheritance-nontrivial-class-members.cpp
diff --git a/compiler-rt/test/msan/dtor-multiple-inheritance.cc b/compiler-rt/test/msan/dtor-multiple-inheritance.cpp
index 0704bf7b319..0704bf7b319 100644
--- a/compiler-rt/test/msan/dtor-multiple-inheritance.cc
+++ b/compiler-rt/test/msan/dtor-multiple-inheritance.cpp
diff --git a/compiler-rt/test/msan/dtor-trivial-class-members.cc b/compiler-rt/test/msan/dtor-trivial-class-members.cpp
index 8960dc647c6..8960dc647c6 100644
--- a/compiler-rt/test/msan/dtor-trivial-class-members.cc
+++ b/compiler-rt/test/msan/dtor-trivial-class-members.cpp
diff --git a/compiler-rt/test/msan/dtor-vtable-multiple-inheritance.cc b/compiler-rt/test/msan/dtor-vtable-multiple-inheritance.cpp
index 8521fadd072..8521fadd072 100644
--- a/compiler-rt/test/msan/dtor-vtable-multiple-inheritance.cc
+++ b/compiler-rt/test/msan/dtor-vtable-multiple-inheritance.cpp
diff --git a/compiler-rt/test/msan/dtor-vtable.cc b/compiler-rt/test/msan/dtor-vtable.cpp
index 9bbad26092d..9bbad26092d 100644
--- a/compiler-rt/test/msan/dtor-vtable.cc
+++ b/compiler-rt/test/msan/dtor-vtable.cpp
diff --git a/compiler-rt/test/msan/errno.cc b/compiler-rt/test/msan/errno.cpp
index 6ed0fd4108e..6ed0fd4108e 100644
--- a/compiler-rt/test/msan/errno.cc
+++ b/compiler-rt/test/msan/errno.cpp
diff --git a/compiler-rt/test/msan/fgets_fputs.cc b/compiler-rt/test/msan/fgets_fputs.cpp
index 1e96943980d..1e96943980d 100644
--- a/compiler-rt/test/msan/fgets_fputs.cc
+++ b/compiler-rt/test/msan/fgets_fputs.cpp
diff --git a/compiler-rt/test/msan/fork.cc b/compiler-rt/test/msan/fork.cpp
index 87d71f87efe..87d71f87efe 100644
--- a/compiler-rt/test/msan/fork.cc
+++ b/compiler-rt/test/msan/fork.cpp
diff --git a/compiler-rt/test/msan/fread_fwrite.cc b/compiler-rt/test/msan/fread_fwrite.cpp
index 3d500342a1e..3d500342a1e 100644
--- a/compiler-rt/test/msan/fread_fwrite.cc
+++ b/compiler-rt/test/msan/fread_fwrite.cpp
diff --git a/compiler-rt/test/msan/fstat.cc b/compiler-rt/test/msan/fstat.cpp
index 83f97054cea..83f97054cea 100644
--- a/compiler-rt/test/msan/fstat.cc
+++ b/compiler-rt/test/msan/fstat.cpp
diff --git a/compiler-rt/test/msan/ftime.cc b/compiler-rt/test/msan/ftime.cpp
index 2bc8a6f2fe1..2bc8a6f2fe1 100644
--- a/compiler-rt/test/msan/ftime.cc
+++ b/compiler-rt/test/msan/ftime.cpp
diff --git a/compiler-rt/test/msan/getaddrinfo-positive.cc b/compiler-rt/test/msan/getaddrinfo-positive.cpp
index 45c1b604d1e..891fcf88116 100644
--- a/compiler-rt/test/msan/getaddrinfo-positive.cc
+++ b/compiler-rt/test/msan/getaddrinfo-positive.cpp
@@ -18,6 +18,6 @@ int main(void) {
   res = getaddrinfo("localhost", NULL, &hint, &ai);
   // CHECK: Uninitialized bytes in __interceptor_getaddrinfo at offset 0 inside [0x{{.*}}, 48)
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #0 {{.*}} in main {{.*}}getaddrinfo-positive.cc:[[@LINE-3]]
+  // CHECK: #0 {{.*}} in main {{.*}}getaddrinfo-positive.cpp:[[@LINE-3]]
   return 0;
 }
diff --git a/compiler-rt/test/msan/getaddrinfo.cc b/compiler-rt/test/msan/getaddrinfo.cpp
index c9dcf3ecbae..c9dcf3ecbae 100644
--- a/compiler-rt/test/msan/getaddrinfo.cc
+++ b/compiler-rt/test/msan/getaddrinfo.cpp
diff --git a/compiler-rt/test/msan/getline.cc b/compiler-rt/test/msan/getline.cpp
index ee12d4ddc52..ee12d4ddc52 100644
--- a/compiler-rt/test/msan/getline.cc
+++ b/compiler-rt/test/msan/getline.cpp
diff --git a/compiler-rt/test/msan/getloadavg.cc b/compiler-rt/test/msan/getloadavg.cpp
index 7facd580daf..7facd580daf 100644
--- a/compiler-rt/test/msan/getloadavg.cc
+++ b/compiler-rt/test/msan/getloadavg.cpp
diff --git a/compiler-rt/test/msan/getutent.cc b/compiler-rt/test/msan/getutent.cpp
index b57101068dd..b57101068dd 100644
--- a/compiler-rt/test/msan/getutent.cc
+++ b/compiler-rt/test/msan/getutent.cpp
diff --git a/compiler-rt/test/msan/heap-origin.cc b/compiler-rt/test/msan/heap-origin.cpp
index 4f170f0d737..5fd9084ade5 100644
--- a/compiler-rt/test/msan/heap-origin.cc
+++ b/compiler-rt/test/msan/heap-origin.cpp
@@ -21,11 +21,11 @@ int main(int argc, char **argv) {
   char *volatile x = (char*)malloc(5 * sizeof(char));
   return *x;
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*heap-origin.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*heap-origin.cpp:}}[[@LINE-2]]
 
   // CHECK-ORIGINS: Uninitialized value was created by a heap allocation
   // CHECK-ORIGINS: {{#0 0x.* in .*malloc}}
-  // CHECK-ORIGINS: {{#1 0x.* in main .*heap-origin.cc:}}[[@LINE-7]]
+  // CHECK-ORIGINS: {{#1 0x.* in main .*heap-origin.cpp:}}[[@LINE-7]]
 
-  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*heap-origin.cc:.* main}}
+  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*heap-origin.cpp:.* main}}
 }
diff --git a/compiler-rt/test/msan/icmp_slt_allones.cc b/compiler-rt/test/msan/icmp_slt_allones.cpp
index 8eff2eac8ad..8eff2eac8ad 100644
--- a/compiler-rt/test/msan/icmp_slt_allones.cc
+++ b/compiler-rt/test/msan/icmp_slt_allones.cpp
diff --git a/compiler-rt/test/msan/iconv.cc b/compiler-rt/test/msan/iconv.cpp
index 7713cb8e5f4..e2d08e9afe7 100644
--- a/compiler-rt/test/msan/iconv.cc
+++ b/compiler-rt/test/msan/iconv.cpp
@@ -42,7 +42,7 @@ int main(void) {
 
   res = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #0 {{.*}} in main {{.*}}iconv.cc:[[@LINE-2]]
+  // CHECK: #0 {{.*}} in main {{.*}}iconv.cpp:[[@LINE-2]]
   assert(res != (size_t)-1);
   assert(inbytesleft == 0);
 
diff --git a/compiler-rt/test/msan/if_indextoname.cc b/compiler-rt/test/msan/if_indextoname.cpp
index 7b1b989e57d..7b1b989e57d 100644
--- a/compiler-rt/test/msan/if_indextoname.cc
+++ b/compiler-rt/test/msan/if_indextoname.cpp
diff --git a/compiler-rt/test/msan/ifaddrs.cc b/compiler-rt/test/msan/ifaddrs.cpp
index 91730a01f2d..91730a01f2d 100644
--- a/compiler-rt/test/msan/ifaddrs.cc
+++ b/compiler-rt/test/msan/ifaddrs.cpp
diff --git a/compiler-rt/test/msan/initgroups.cc b/compiler-rt/test/msan/initgroups.cpp
index 974b1cbaa66..974b1cbaa66 100644
--- a/compiler-rt/test/msan/initgroups.cc
+++ b/compiler-rt/test/msan/initgroups.cpp
diff --git a/compiler-rt/test/msan/inline.cc b/compiler-rt/test/msan/inline.cpp
index b2fa9615085..b2fa9615085 100644
--- a/compiler-rt/test/msan/inline.cc
+++ b/compiler-rt/test/msan/inline.cpp
diff --git a/compiler-rt/test/msan/insertvalue_origin.cc b/compiler-rt/test/msan/insertvalue_origin.cpp
index a0c70023f2f..68e7d9a7b7f 100644
--- a/compiler-rt/test/msan/insertvalue_origin.cc
+++ b/compiler-rt/test/msan/insertvalue_origin.cpp
@@ -26,10 +26,10 @@ int main() {
  if (z.x)
    printf("zzz\n");
  // CHECK: MemorySanitizer: use-of-uninitialized-value
- // CHECK: {{in main .*insertvalue_origin.cc:}}[[@LINE-3]]
+ // CHECK: {{in main .*insertvalue_origin.cpp:}}[[@LINE-3]]
 
  // CHECK: Uninitialized value was created by a heap allocation
- // CHECK: {{in main .*insertvalue_origin.cc:}}[[@LINE-8]]
+ // CHECK: {{in main .*insertvalue_origin.cpp:}}[[@LINE-8]]
  delete p;
  return 0;
 }
diff --git a/compiler-rt/test/msan/ioctl.cc b/compiler-rt/test/msan/ioctl.cpp
index 66ac6e95b66..66ac6e95b66 100644
--- a/compiler-rt/test/msan/ioctl.cc
+++ b/compiler-rt/test/msan/ioctl.cpp
diff --git a/compiler-rt/test/msan/ioctl_custom.cc b/compiler-rt/test/msan/ioctl_custom.cpp
index 794f3453535..c01a6c89a55 100644
--- a/compiler-rt/test/msan/ioctl_custom.cc
+++ b/compiler-rt/test/msan/ioctl_custom.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv) {
   int res = ioctl(fd, SIOCGIFCONF, (void *)&ifc);
   // CHECK: Uninitialized bytes in ioctl{{.*}} at offset 0 inside [0x{{.*}}, 4)
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #{{.*}} in main {{.*}}ioctl_custom.cc:[[@LINE-3]]
+  // CHECK: #{{.*}} in main {{.*}}ioctl_custom.cpp:[[@LINE-3]]
   assert(res == 0);
   for (int i = 0; i < ifc.ifc_len / sizeof(*ifc.ifc_ifcu.ifcu_req); ++i)
     printf("%d  %zu  %s\n", i, strlen(ifreqs[i].ifr_name), ifreqs[i].ifr_name);
diff --git a/compiler-rt/test/msan/memcmp_test.cc b/compiler-rt/test/msan/memcmp_test.cpp
index 42230cc4d0c..42230cc4d0c 100644
--- a/compiler-rt/test/msan/memcmp_test.cc
+++ b/compiler-rt/test/msan/memcmp_test.cpp
diff --git a/compiler-rt/test/msan/mktime.cc b/compiler-rt/test/msan/mktime.cpp
index 997fb0ddbba..7d4d929815b 100644
--- a/compiler-rt/test/msan/mktime.cc
+++ b/compiler-rt/test/msan/mktime.cpp
@@ -19,7 +19,7 @@ int main(void) {
   tm.tm_isdst = -1;
   time_t t = mktime(&tm);
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: in main{{.*}}mktime.cc:[[@LINE-2]]
+  // CHECK: in main{{.*}}mktime.cpp:[[@LINE-2]]
   assert(t != -1);
   assert(__msan_test_shadow(&tm, sizeof(tm)) == -1);
   return 0;
diff --git a/compiler-rt/test/msan/mmap.cc b/compiler-rt/test/msan/mmap.cpp
index d8342373521..d8342373521 100644
--- a/compiler-rt/test/msan/mmap.cc
+++ b/compiler-rt/test/msan/mmap.cpp
diff --git a/compiler-rt/test/msan/mmap_below_shadow.cc b/compiler-rt/test/msan/mmap_below_shadow.cpp
index 806b19da8ca..806b19da8ca 100644
--- a/compiler-rt/test/msan/mmap_below_shadow.cc
+++ b/compiler-rt/test/msan/mmap_below_shadow.cpp
diff --git a/compiler-rt/test/msan/msan_check_mem_is_initialized.cc b/compiler-rt/test/msan/msan_check_mem_is_initialized.cpp
index 2991501921e..81f7895f7ae 100644
--- a/compiler-rt/test/msan/msan_check_mem_is_initialized.cc
+++ b/compiler-rt/test/msan/msan_check_mem_is_initialized.cpp
@@ -21,7 +21,7 @@ int main(void) {
   // CHECK-VERBOSE: 0x{{.*}}: 00000000 00...... ........ ........
 
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #0 0x{{.*}}in main{{.*}}msan_check_mem_is_initialized.cc:[[@LINE-7]]
+  // CHECK: #0 0x{{.*}}in main{{.*}}msan_check_mem_is_initialized.cpp:[[@LINE-7]]
 #endif
   return 0;
 }
diff --git a/compiler-rt/test/msan/msan_copy_shadow.cc b/compiler-rt/test/msan/msan_copy_shadow.cpp
index cc7ec03b29e..a3ec39ca108 100644
--- a/compiler-rt/test/msan/msan_copy_shadow.cc
+++ b/compiler-rt/test/msan/msan_copy_shadow.cpp
@@ -26,10 +26,10 @@ int main() {
   assert(__msan_test_shadow(b + 3, 1) == -1);
   __msan_check_mem_is_initialized(b, 4);
   // CHECK: use-of-uninitialized-value
-  // CHECK:   {{in main.*msan_copy_shadow.cc:}}[[@LINE-2]]
+  // CHECK:   {{in main.*msan_copy_shadow.cpp:}}[[@LINE-2]]
   // CHECK: Uninitialized value was stored to memory at
-  // CHECK-FULL-STACK:   {{in main.*msan_copy_shadow.cc:}}[[@LINE-8]]
+  // CHECK-FULL-STACK:   {{in main.*msan_copy_shadow.cpp:}}[[@LINE-8]]
   // CHECK-SHORT-STACK:   {{in __msan_copy_shadow .*msan_interceptors.cpp:}}
   // CHECK: Uninitialized value was created by a heap allocation
-  // CHECK:   {{in main.*msan_copy_shadow.cc:}}[[@LINE-23]]
+  // CHECK:   {{in main.*msan_copy_shadow.cpp:}}[[@LINE-23]]
 }
diff --git a/compiler-rt/test/msan/msan_dump_shadow.cc b/compiler-rt/test/msan/msan_dump_shadow.cpp
index 543fa701322..543fa701322 100644
--- a/compiler-rt/test/msan/msan_dump_shadow.cc
+++ b/compiler-rt/test/msan/msan_dump_shadow.cpp
diff --git a/compiler-rt/test/msan/msan_print_shadow.cc b/compiler-rt/test/msan/msan_print_shadow.cpp
index 9668be2c240..bdee3102c1c 100644
--- a/compiler-rt/test/msan/msan_print_shadow.cc
+++ b/compiler-rt/test/msan/msan_print_shadow.cpp
@@ -96,27 +96,27 @@ int main(void) {
 
 // CHECK-ORIGINS: Origin A (origin_id {{.*}}):
 // CHECK-ORIGINS:   Uninitialized value was created by a heap allocation
-// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cc:14
+// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cpp:14
 
 // CHECK-ORIGINS: Origin B (origin_id {{.*}}):
 // CHECK-ORIGINS:   Memory was marked as uninitialized
 // CHECK-ORIGINS:     #0 {{.*}} in __msan_allocated_memory
-// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cc:18
+// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cpp:18
 
 // CHECK-ORIGINS: Origin C (origin_id {{.*}}):
 // CHECK-ORIGINS-2:  Uninitialized value was stored to memory at
-// CHECK-ORIGINS-2:    #0 {{.*}} in main{{.*}}msan_print_shadow.cc:48
+// CHECK-ORIGINS-2:    #0 {{.*}} in main{{.*}}msan_print_shadow.cpp:48
 // CHECK-ORIGINS:   Uninitialized value was created by an allocation of 'x' in the stack frame of function 'main'
-// CHECK-ORIGINS:     #0 {{.*}} in main{{.*}}msan_print_shadow.cc:12
+// CHECK-ORIGINS:     #0 {{.*}} in main{{.*}}msan_print_shadow.cpp:12
 
 // CHECK-ORIGINS: Origin D (origin_id {{.*}}):
 // CHECK-ORIGINS:   Memory was marked as uninitialized
 // CHECK-ORIGINS:     #0 {{.*}} in __msan_allocated_memory
-// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cc:20
+// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cpp:20
 
 // ...
 
 // CHECK-ORIGINS: Origin Z (origin_id {{.*}}):
 // CHECK-ORIGINS:   Memory was marked as uninitialized
 // CHECK-ORIGINS:     #0 {{.*}} in __msan_allocated_memory
-// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cc:42
+// CHECK-ORIGINS:     #1 {{.*}} in main{{.*}}msan_print_shadow.cpp:42
diff --git a/compiler-rt/test/msan/msan_print_shadow2.cc b/compiler-rt/test/msan/msan_print_shadow2.cpp
index 5095081c965..5095081c965 100644
--- a/compiler-rt/test/msan/msan_print_shadow2.cc
+++ b/compiler-rt/test/msan/msan_print_shadow2.cpp
diff --git a/compiler-rt/test/msan/msan_print_shadow3.cc b/compiler-rt/test/msan/msan_print_shadow3.cpp
index 410755e5dba..410755e5dba 100644
--- a/compiler-rt/test/msan/msan_print_shadow3.cc
+++ b/compiler-rt/test/msan/msan_print_shadow3.cpp
diff --git a/compiler-rt/test/msan/mul_by_const.cc b/compiler-rt/test/msan/mul_by_const.cpp
index 8240fdbedb5..8240fdbedb5 100644
--- a/compiler-rt/test/msan/mul_by_const.cc
+++ b/compiler-rt/test/msan/mul_by_const.cpp
diff --git a/compiler-rt/test/msan/no_sanitize_memory.cc b/compiler-rt/test/msan/no_sanitize_memory.cpp
index 5c53ee4f348..5c53ee4f348 100644
--- a/compiler-rt/test/msan/no_sanitize_memory.cc
+++ b/compiler-rt/test/msan/no_sanitize_memory.cpp
diff --git a/compiler-rt/test/msan/no_sanitize_memory_prop.cc b/compiler-rt/test/msan/no_sanitize_memory_prop.cpp
index bfd4194dd26..bfd4194dd26 100644
--- a/compiler-rt/test/msan/no_sanitize_memory_prop.cc
+++ b/compiler-rt/test/msan/no_sanitize_memory_prop.cpp
diff --git a/compiler-rt/test/msan/origin-store-long.cc b/compiler-rt/test/msan/origin-store-long.cpp
index 5c9fe04b720..ece05033383 100644
--- a/compiler-rt/test/msan/origin-store-long.cc
+++ b/compiler-rt/test/msan/origin-store-long.cpp
@@ -13,9 +13,9 @@ int main() {
   char *z = (char *)p;
   return z[6];
 // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-// CHECK:   in main {{.*}}origin-store-long.cc:[[@LINE-2]]
+// CHECK:   in main {{.*}}origin-store-long.cpp:[[@LINE-2]]
 
 // CHECK:  Uninitialized value was created by a heap allocation
-// CHECK:   in main {{.*}}origin-store-long.cc:[[@LINE-8]]
+// CHECK:   in main {{.*}}origin-store-long.cpp:[[@LINE-8]]
 }
 
diff --git a/compiler-rt/test/msan/param_tls_limit.cc b/compiler-rt/test/msan/param_tls_limit.cpp
index d34376a1f0c..d34376a1f0c 100644
--- a/compiler-rt/test/msan/param_tls_limit.cc
+++ b/compiler-rt/test/msan/param_tls_limit.cpp
diff --git a/compiler-rt/test/msan/poison_in_free.cc b/compiler-rt/test/msan/poison_in_free.cpp
index 16e2124c3d5..e144c147a32 100644
--- a/compiler-rt/test/msan/poison_in_free.cc
+++ b/compiler-rt/test/msan/poison_in_free.cpp
@@ -12,5 +12,5 @@ int main(int argc, char **argv) {
   free(x);
   return x[25];
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #0 {{.*}} in main{{.*}}poison_in_free.cc:[[@LINE-2]]
+  // CHECK: #0 {{.*}} in main{{.*}}poison_in_free.cpp:[[@LINE-2]]
 }
diff --git a/compiler-rt/test/msan/print_stats.cc b/compiler-rt/test/msan/print_stats.cpp
index 5b46d4ebbff..5b46d4ebbff 100644
--- a/compiler-rt/test/msan/print_stats.cc
+++ b/compiler-rt/test/msan/print_stats.cpp
diff --git a/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cpp
index 241caa2a211..241caa2a211 100644
--- a/compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
+++ b/compiler-rt/test/msan/pthread_getattr_np_deadlock.cpp
diff --git a/compiler-rt/test/msan/pthread_getname_np.cc b/compiler-rt/test/msan/pthread_getname_np.cpp
index 4827b3a0064..4827b3a0064 100644
--- a/compiler-rt/test/msan/pthread_getname_np.cc
+++ b/compiler-rt/test/msan/pthread_getname_np.cpp
diff --git a/compiler-rt/test/msan/pthread_setcancelstate.cc b/compiler-rt/test/msan/pthread_setcancelstate.cpp
index 087c2223a83..087c2223a83 100644
--- a/compiler-rt/test/msan/pthread_setcancelstate.cc
+++ b/compiler-rt/test/msan/pthread_setcancelstate.cpp
diff --git a/compiler-rt/test/msan/rand_r.cc b/compiler-rt/test/msan/rand_r.cpp
index f40cf9f9632..d83c43a6d85 100644
--- a/compiler-rt/test/msan/rand_r.cc
+++ b/compiler-rt/test/msan/rand_r.cpp
@@ -12,7 +12,7 @@ int main(void) {
 #endif
   int v = rand_r(&seed);
   // CHECK: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: in main{{.*}}rand_r.cc:[[@LINE-2]]
+  // CHECK: in main{{.*}}rand_r.cpp:[[@LINE-2]]
   if (v) printf(".\n");
   return 0;
 }
diff --git a/compiler-rt/test/msan/readdir64.cc b/compiler-rt/test/msan/readdir64.cpp
index e77ada6ac8f..e77ada6ac8f 100644
--- a/compiler-rt/test/msan/readdir64.cc
+++ b/compiler-rt/test/msan/readdir64.cpp
diff --git a/compiler-rt/test/msan/realloc-large-origin.cc b/compiler-rt/test/msan/realloc-large-origin.cpp
index 6893c1d17c4..b19fb60c804 100644
--- a/compiler-rt/test/msan/realloc-large-origin.cc
+++ b/compiler-rt/test/msan/realloc-large-origin.cpp
@@ -18,14 +18,14 @@ int main(int argc, char **argv) {
   return x;
 
 // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-// CHECK:   {{#0 0x.* in main .*realloc-large-origin.cc:}}[[@LINE-3]]
+// CHECK:   {{#0 0x.* in main .*realloc-large-origin.cpp:}}[[@LINE-3]]
 
 // CHECK:  Uninitialized value was stored to memory at
 // CHECK-FULL-STACK:   {{#0 0x.* in .*realloc}}
-// CHECK-FULL-STACK:   {{#1 0x.* in main .*realloc-large-origin.cc:}}[[@LINE-10]]
+// CHECK-FULL-STACK:   {{#1 0x.* in main .*realloc-large-origin.cpp:}}[[@LINE-10]]
 // CHECK-SHORT-STACK:   {{#0 0x.* in .*realloc}}
 
 // CHECK:   Uninitialized value was created by a heap allocation
 // CHECK:   {{#0 0x.* in .*malloc}}
-// CHECK:   {{#1 0x.* in main .*realloc-large-origin.cc:}}[[@LINE-16]]
+// CHECK:   {{#1 0x.* in main .*realloc-large-origin.cpp:}}[[@LINE-16]]
 }
diff --git a/compiler-rt/test/msan/realloc-origin.cc b/compiler-rt/test/msan/realloc-origin.cpp
index e6893713ea4..5bceddad660 100644
--- a/compiler-rt/test/msan/realloc-origin.cc
+++ b/compiler-rt/test/msan/realloc-origin.cpp
@@ -13,9 +13,9 @@ int main(int argc, char **argv) {
   free(p);
   return x;
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*realloc-origin.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*realloc-origin.cpp:}}[[@LINE-2]]
 
   // CHECK: Uninitialized value was created by a heap allocation
   // CHECK: {{#0 0x.* in .*realloc}}
-  // CHECK: {{#1 0x.* in main .*realloc-origin.cc:}}[[@LINE-9]]
+  // CHECK: {{#1 0x.* in main .*realloc-origin.cpp:}}[[@LINE-9]]
 }
diff --git a/compiler-rt/test/msan/recover-dso.cc b/compiler-rt/test/msan/recover-dso.cpp
index 2f4225659dd..2f4225659dd 100644
--- a/compiler-rt/test/msan/recover-dso.cc
+++ b/compiler-rt/test/msan/recover-dso.cpp
diff --git a/compiler-rt/test/msan/recover.cc b/compiler-rt/test/msan/recover.cpp
index cb9916ef475..cb9916ef475 100644
--- a/compiler-rt/test/msan/recover.cc
+++ b/compiler-rt/test/msan/recover.cpp
diff --git a/compiler-rt/test/msan/report-demangling.cc b/compiler-rt/test/msan/report-demangling.cpp
index fbb6554470f..9ef6113cfd0 100644
--- a/compiler-rt/test/msan/report-demangling.cc
+++ b/compiler-rt/test/msan/report-demangling.cpp
@@ -15,5 +15,5 @@ int main(int argc, char **argv) {
   return f();
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
   // CHECK: Uninitialized value was created by an allocation of 'x' in the stack frame of function '_Z1fv'
-  // CHECK: #0 {{.*}} in f{{.*}} {{.*}}report-demangling.cc:[[@LINE-10]]
+  // CHECK: #0 {{.*}} in f{{.*}} {{.*}}report-demangling.cpp:[[@LINE-10]]
 }
diff --git a/compiler-rt/test/msan/scandir.cc b/compiler-rt/test/msan/scandir.cpp
index 8adfe006602..8adfe006602 100644
--- a/compiler-rt/test/msan/scandir.cc
+++ b/compiler-rt/test/msan/scandir.cpp
diff --git a/compiler-rt/test/msan/scandir_null.cc b/compiler-rt/test/msan/scandir_null.cpp
index 94ac31a4143..94ac31a4143 100644
--- a/compiler-rt/test/msan/scandir_null.cc
+++ b/compiler-rt/test/msan/scandir_null.cpp
diff --git a/compiler-rt/test/msan/scoped-interceptors.cc b/compiler-rt/test/msan/scoped-interceptors.cpp
index 5eff33d6bf6..5eff33d6bf6 100644
--- a/compiler-rt/test/msan/scoped-interceptors.cc
+++ b/compiler-rt/test/msan/scoped-interceptors.cpp
diff --git a/compiler-rt/test/msan/select.cc b/compiler-rt/test/msan/select.cpp
index 7b8c34785c2..1a2d3ece433 100644
--- a/compiler-rt/test/msan/select.cc
+++ b/compiler-rt/test/msan/select.cpp
@@ -15,8 +15,8 @@ int main(int argc, char **argv) {
   if (z)
     exit(0);
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*select.cc:}}[[@LINE-3]]
+  // CHECK: {{#0 0x.* in main .*select.cpp:}}[[@LINE-3]]
 
-  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*select.cc:.* main}}
+  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*select.cpp:.* main}}
   return 0;
 }
diff --git a/compiler-rt/test/msan/select_float_origin.cc b/compiler-rt/test/msan/select_float_origin.cpp
index 75731dc457f..730b18c57b1 100644
--- a/compiler-rt/test/msan/select_float_origin.cc
+++ b/compiler-rt/test/msan/select_float_origin.cpp
@@ -19,6 +19,6 @@ int main() {
   if (z > 0) printf(".\n");
   // CHECK: Memory was marked as uninitialized
   // CHECK: {{#0 0x.* in .*__msan_allocated_memory}}
-  // CHECK: {{#1 0x.* in main .*select_float_origin.cc:}}[[@LINE-6]]
+  // CHECK: {{#1 0x.* in main .*select_float_origin.cpp:}}[[@LINE-6]]
   return 0;
 }
diff --git a/compiler-rt/test/msan/select_origin.cc b/compiler-rt/test/msan/select_origin.cpp
index e832c02e99c..e832c02e99c 100644
--- a/compiler-rt/test/msan/select_origin.cc
+++ b/compiler-rt/test/msan/select_origin.cpp
diff --git a/compiler-rt/test/msan/sem_getvalue.cc b/compiler-rt/test/msan/sem_getvalue.cpp
index 07b95cd493a..07b95cd493a 100644
--- a/compiler-rt/test/msan/sem_getvalue.cc
+++ b/compiler-rt/test/msan/sem_getvalue.cpp
diff --git a/compiler-rt/test/msan/setlocale.cc b/compiler-rt/test/msan/setlocale.cpp
index 796f4454e6a..796f4454e6a 100644
--- a/compiler-rt/test/msan/setlocale.cc
+++ b/compiler-rt/test/msan/setlocale.cpp
diff --git a/compiler-rt/test/msan/sigaction.cc b/compiler-rt/test/msan/sigaction.cpp
index 0c69f115fdb..0c69f115fdb 100644
--- a/compiler-rt/test/msan/sigaction.cc
+++ b/compiler-rt/test/msan/sigaction.cpp
diff --git a/compiler-rt/test/msan/signal_stress_test.cc b/compiler-rt/test/msan/signal_stress_test.cpp
index dfbc580faf2..dfbc580faf2 100644
--- a/compiler-rt/test/msan/signal_stress_test.cc
+++ b/compiler-rt/test/msan/signal_stress_test.cpp
diff --git a/compiler-rt/test/msan/sigwait.cc b/compiler-rt/test/msan/sigwait.cpp
index 222fc34a169..222fc34a169 100644
--- a/compiler-rt/test/msan/sigwait.cc
+++ b/compiler-rt/test/msan/sigwait.cpp
diff --git a/compiler-rt/test/msan/sigwaitinfo.cc b/compiler-rt/test/msan/sigwaitinfo.cpp
index be7a2c009e0..be7a2c009e0 100644
--- a/compiler-rt/test/msan/sigwaitinfo.cc
+++ b/compiler-rt/test/msan/sigwaitinfo.cpp
diff --git a/compiler-rt/test/msan/stack-origin.cc b/compiler-rt/test/msan/stack-origin.cpp
index e69c072242c..3e315260ada 100644
--- a/compiler-rt/test/msan/stack-origin.cc
+++ b/compiler-rt/test/msan/stack-origin.cpp
@@ -22,10 +22,10 @@ int main(int argc, char **argv) {
   int *volatile p = &x;
   return *p;
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*stack-origin.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*stack-origin.cpp:}}[[@LINE-2]]
 
   // CHECK-ORIGINS: Uninitialized value was created by an allocation of 'x' in the stack frame of function 'main'
-  // CHECK-ORIGINS: {{#0 0x.* in main .*stack-origin.cc:}}[[@LINE-8]]
+  // CHECK-ORIGINS: {{#0 0x.* in main .*stack-origin.cpp:}}[[@LINE-8]]
 
-  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*stack-origin.cc:.* main}}
+  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*stack-origin.cpp:.* main}}
 }
diff --git a/compiler-rt/test/msan/stack-origin2.cc b/compiler-rt/test/msan/stack-origin2.cpp
index 6c7428c2dec..2ef3e180c4a 100644
--- a/compiler-rt/test/msan/stack-origin2.cc
+++ b/compiler-rt/test/msan/stack-origin2.cpp
@@ -32,10 +32,10 @@ int f(int depth) {
 int main(int argc, char **argv) {
   return f(1);
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*stack-origin2.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*stack-origin2.cpp:}}[[@LINE-2]]
 
   // CHECK-ORIGINS: Uninitialized value was created by an allocation of 'x' in the stack frame of function 'f'
-  // CHECK-ORIGINS: {{#0 0x.* in f .*stack-origin2.cc:}}[[@LINE-14]]
+  // CHECK-ORIGINS: {{#0 0x.* in f .*stack-origin2.cpp:}}[[@LINE-14]]
 
-  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*stack-origin2.cc:.* main}}
+  // CHECK: SUMMARY: MemorySanitizer: use-of-uninitialized-value {{.*stack-origin2.cpp:.* main}}
 }
diff --git a/compiler-rt/test/msan/strlen_of_shadow.cc b/compiler-rt/test/msan/strlen_of_shadow.cpp
index 718cc08dc1f..718cc08dc1f 100644
--- a/compiler-rt/test/msan/strlen_of_shadow.cc
+++ b/compiler-rt/test/msan/strlen_of_shadow.cpp
diff --git a/compiler-rt/test/msan/strndup.cc b/compiler-rt/test/msan/strndup.cpp
index 07bdd9f8f5f..c9d425c0259 100644
--- a/compiler-rt/test/msan/strndup.cc
+++ b/compiler-rt/test/msan/strndup.cpp
@@ -20,9 +20,9 @@ int main(int argc, char **argv) {
   return 0;
   // ON: Uninitialized bytes in __interceptor_{{(__)?}}strndup at offset 2 inside [{{.*}}, 4)
   // ON: MemorySanitizer: use-of-uninitialized-value
-  // ON: #0 {{.*}}main {{.*}}strndup.cc:[[@LINE-6]]
+  // ON: #0 {{.*}}main {{.*}}strndup.cpp:[[@LINE-6]]
   // ON-LABEL: SUMMARY
-  // ON: {{.*}}strndup.cc:[[@LINE-8]]
+  // ON: {{.*}}strndup.cpp:[[@LINE-8]]
   // OFF-NOT: MemorySanitizer
 }
 
diff --git a/compiler-rt/test/msan/strxfrm.cc b/compiler-rt/test/msan/strxfrm.cpp
index 94b8c702409..94b8c702409 100644
--- a/compiler-rt/test/msan/strxfrm.cc
+++ b/compiler-rt/test/msan/strxfrm.cpp
diff --git a/compiler-rt/test/msan/sync_lock_set_and_test.cc b/compiler-rt/test/msan/sync_lock_set_and_test.cpp
index 11fd14fae0f..11fd14fae0f 100644
--- a/compiler-rt/test/msan/sync_lock_set_and_test.cc
+++ b/compiler-rt/test/msan/sync_lock_set_and_test.cpp
diff --git a/compiler-rt/test/msan/textdomain.cc b/compiler-rt/test/msan/textdomain.cpp
index 478b0993f83..478b0993f83 100644
--- a/compiler-rt/test/msan/textdomain.cc
+++ b/compiler-rt/test/msan/textdomain.cpp
diff --git a/compiler-rt/test/msan/times.cc b/compiler-rt/test/msan/times.cpp
index 7c81884118b..7c81884118b 100644
--- a/compiler-rt/test/msan/times.cc
+++ b/compiler-rt/test/msan/times.cpp
diff --git a/compiler-rt/test/msan/tls_reuse.cc b/compiler-rt/test/msan/tls_reuse.cpp
index 78a328fa3ce..78a328fa3ce 100644
--- a/compiler-rt/test/msan/tls_reuse.cc
+++ b/compiler-rt/test/msan/tls_reuse.cpp
diff --git a/compiler-rt/test/msan/tsearch.cc b/compiler-rt/test/msan/tsearch.cpp
index 50a2efb31fa..50a2efb31fa 100644
--- a/compiler-rt/test/msan/tsearch.cc
+++ b/compiler-rt/test/msan/tsearch.cpp
diff --git a/compiler-rt/test/msan/tzset.cc b/compiler-rt/test/msan/tzset.cpp
index 05915e047e1..05915e047e1 100644
--- a/compiler-rt/test/msan/tzset.cc
+++ b/compiler-rt/test/msan/tzset.cpp
diff --git a/compiler-rt/test/msan/unaligned_read_origin.cc b/compiler-rt/test/msan/unaligned_read_origin.cpp
index b04800a139f..cf25122ad31 100644
--- a/compiler-rt/test/msan/unaligned_read_origin.cc
+++ b/compiler-rt/test/msan/unaligned_read_origin.cpp
@@ -10,7 +10,7 @@ int main(int argc, char **argv) {
   int *volatile p = &x;
   return __sanitizer_unaligned_load32(p);
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*unaligned_read_origin.cc:}}[[@LINE-2]]
+  // CHECK: {{#0 0x.* in main .*unaligned_read_origin.cpp:}}[[@LINE-2]]
   // CHECK: Uninitialized value was created by an allocation of 'x' in the stack frame of function 'main'
-  // CHECK: {{#0 0x.* in main .*unaligned_read_origin.cc:}}[[@LINE-7]]
+  // CHECK: {{#0 0x.* in main .*unaligned_read_origin.cpp:}}[[@LINE-7]]
 }
diff --git a/compiler-rt/test/msan/unpoison_param.cc b/compiler-rt/test/msan/unpoison_param.cpp
index f59d2cbe231..f59d2cbe231 100644
--- a/compiler-rt/test/msan/unpoison_param.cc
+++ b/compiler-rt/test/msan/unpoison_param.cpp
diff --git a/compiler-rt/test/msan/unpoison_string.cc b/compiler-rt/test/msan/unpoison_string.cpp
index 84d95283353..84d95283353 100644
--- a/compiler-rt/test/msan/unpoison_string.cc
+++ b/compiler-rt/test/msan/unpoison_string.cpp
diff --git a/compiler-rt/test/msan/use-after-dtor.cc b/compiler-rt/test/msan/use-after-dtor.cpp
index 45f4dcd69b7..7566ab728d2 100644
--- a/compiler-rt/test/msan/use-after-dtor.cc
+++ b/compiler-rt/test/msan/use-after-dtor.cpp
@@ -39,7 +39,7 @@ int main() {
   return s->x_;
 
   // CHECK-UAD: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK-UAD: {{#0 0x.* in main.*use-after-dtor.cc:}}[[@LINE-3]]
+  // CHECK-UAD: {{#0 0x.* in main.*use-after-dtor.cpp:}}[[@LINE-3]]
 
   // CHECK-ORIGINS: Memory was marked as uninitialized
   // CHECK-ORIGINS: {{#0 0x.* in __sanitizer_dtor_callback}}
diff --git a/compiler-rt/test/msan/use-after-free.cc b/compiler-rt/test/msan/use-after-free.cpp
index c505124479b..4884befed7b 100644
--- a/compiler-rt/test/msan/use-after-free.cc
+++ b/compiler-rt/test/msan/use-after-free.cpp
@@ -25,10 +25,10 @@ int main(int argc, char **argv) {
   if (*p)
     exit(0);
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: {{#0 0x.* in main .*use-after-free.cc:}}[[@LINE-3]]
+  // CHECK: {{#0 0x.* in main .*use-after-free.cpp:}}[[@LINE-3]]
 
   // CHECK-ORIGINS: Uninitialized value was created by a heap deallocation
   // CHECK-ORIGINS: {{#0 0x.* in .*free}}
-  // CHECK-ORIGINS: {{#1 0x.* in main .*use-after-free.cc:}}[[@LINE-9]]
+  // CHECK-ORIGINS: {{#1 0x.* in main .*use-after-free.cpp:}}[[@LINE-9]]
   return 0;
 }
diff --git a/compiler-rt/test/msan/vararg.cc b/compiler-rt/test/msan/vararg.cpp
index e1a7b126616..e1a7b126616 100644
--- a/compiler-rt/test/msan/vararg.cc
+++ b/compiler-rt/test/msan/vararg.cpp
diff --git a/compiler-rt/test/msan/vector_cvt.cc b/compiler-rt/test/msan/vector_cvt.cpp
index 5541436ead8..aa5327e3c19 100644
--- a/compiler-rt/test/msan/vector_cvt.cc
+++ b/compiler-rt/test/msan/vector_cvt.cpp
@@ -9,7 +9,7 @@ int to_int(double v) {
   int x = _mm_cvtsd_si32(t);
   return x;
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK: #{{.*}} in to_int{{.*}}vector_cvt.cc:[[@LINE-3]]
+  // CHECK: #{{.*}} in to_int{{.*}}vector_cvt.cpp:[[@LINE-3]]
 }
 
 int main() {
diff --git a/compiler-rt/test/msan/vector_div.cc b/compiler-rt/test/msan/vector_div.cpp
index 4ca2369d63e..4ca2369d63e 100644
--- a/compiler-rt/test/msan/vector_div.cc
+++ b/compiler-rt/test/msan/vector_div.cpp
diff --git a/compiler-rt/test/msan/vector_select.cc b/compiler-rt/test/msan/vector_select.cpp
index 0cf11649780..0cf11649780 100644
--- a/compiler-rt/test/msan/vector_select.cc
+++ b/compiler-rt/test/msan/vector_select.cpp
diff --git a/compiler-rt/test/msan/wcsncpy.cc b/compiler-rt/test/msan/wcsncpy.cpp
index 6471371de98..f448ab20266 100644
--- a/compiler-rt/test/msan/wcsncpy.cc
+++ b/compiler-rt/test/msan/wcsncpy.cpp
@@ -29,12 +29,12 @@ int main() {
 }
 // CHECK:  Uninitialized bytes in __msan_check_mem_is_initialized
 // CHECK:  WARNING: MemorySanitizer: use-of-uninitialized-value
-// CHECK:    in main {{.*}}wcsncpy.cc:28
+// CHECK:    in main {{.*}}wcsncpy.cpp:28
 
 // CHECK:  Uninitialized value was stored to memory at
 // CHECK:    in {{[^\s]*}}wcsncpy
-// CHECK:    in main {{.*}}wcsncpy.cc:27
+// CHECK:    in main {{.*}}wcsncpy.cpp:27
 
 // CHECK:  Memory was marked as uninitialized
 // CHECK:    in __msan_allocated_memory
-// CHECK:    in main {{.*}}wcsncpy.cc:25
+// CHECK:    in main {{.*}}wcsncpy.cpp:25
diff --git a/compiler-rt/test/msan/wcsxfrm.cc b/compiler-rt/test/msan/wcsxfrm.cpp
index f13c5d3969a..54e13a10593 100644
--- a/compiler-rt/test/msan/wcsxfrm.cc
+++ b/compiler-rt/test/msan/wcsxfrm.cpp
@@ -25,6 +25,6 @@ int main(void) {
   wcsxfrm(NULL, q, 0);
 
   // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
-  // CHECK:    in main {{.*}}wcsxfrm.cc:25
+  // CHECK:    in main {{.*}}wcsxfrm.cpp:25
   return 0;
 }