From d21b3d346af2f6189638d853182e389555e7ccb9 Mon Sep 17 00:00:00 2001
From: Fangrui Song <maskray@google.com>
Date: Fri, 2 Aug 2019 06:07:05 +0000
Subject: [PATCH] compiler-rt: Rename .cc file in test/msan to .cpp

Like r367463, but for test/msan.

llvm-svn: 367653
---
 compiler-rt/test/msan/Linux/{bzero.cc => bzero.cpp}  |  0
 .../test/msan/Linux/{cmsghdr.cc => cmsghdr.cpp}      |  0
 .../test/msan/Linux/{eventfd.cc => eventfd.cpp}      |  0
 .../msan/Linux/{fopencookie.cc => fopencookie.cpp}   |  0
 .../test/msan/Linux/{forkpty.cc => forkpty.cpp}      |  0
 .../test/msan/Linux/{getresid.cc => getresid.cpp}    |  0
 compiler-rt/test/msan/Linux/{glob.cc => glob.cpp}    |  0
 .../{glob_altdirfunc.cc => glob_altdirfunc.cpp}      |  0
 .../msan/Linux/{glob_nomatch.cc => glob_nomatch.cpp} |  0
 .../msan/Linux/{ioctl_sound.cc => ioctl_sound.cpp}   |  0
 .../test/msan/Linux/{mallinfo.cc => mallinfo.cpp}    |  0
 .../test/msan/Linux/{mincore.cc => mincore.cpp}      |  0
 .../{name_to_handle_at.cc => name_to_handle_at.cpp}  |  0
 .../test/msan/Linux/{obstack.cc => obstack.cpp}      |  2 +-
 compiler-rt/test/msan/Linux/{poll.cc => poll.cpp}    |  0
 .../{process_vm_readv.cc => process_vm_readv.cpp}    |  0
 ...unlimited_stack.cc => reexec_unlimited_stack.cpp} |  0
 .../test/msan/Linux/{sendmsg.cc => sendmsg.cpp}      |  0
 .../msan/Linux/{strerror_r.cc => strerror_r.cpp}     |  0
 .../test/msan/Linux/{sunrpc.cc => sunrpc.cpp}        |  2 +-
 .../msan/Linux/{sunrpc_bytes.cc => sunrpc_bytes.cpp} |  2 +-
 .../Linux/{sunrpc_string.cc => sunrpc_string.cpp}    |  2 +-
 .../test/msan/Linux/{syscalls.cc => syscalls.cpp}    |  0
 ...{syscalls_sigaction.cc => syscalls_sigaction.cpp} |  0
 .../test/msan/Linux/{tcgetattr.cc => tcgetattr.cpp}  |  0
 compiler-rt/test/msan/Linux/{xattr.cc => xattr.cpp}  |  0
 .../test/msan/{__strxfrm_l.cc => __strxfrm_l.cpp}    |  0
 compiler-rt/test/msan/{alloca.cc => alloca.cpp}      |  0
 .../{allocator_mapping.cc => allocator_mapping.cpp}  |  0
 .../test/msan/{backtrace.cc => backtrace.cpp}        |  0
 .../msan/{chained_origin.cc => chained_origin.cpp}   | 20 ++++++++++----------
 ...empty_stack.cc => chained_origin_empty_stack.cpp} |  0
 ...ed_origin_limits.cc => chained_origin_limits.cpp} |  0
 ...ed_origin_memcpy.cc => chained_origin_memcpy.cpp} | 12 ++++++------
 ...th_signals.cc => chained_origin_with_signals.cpp} |  0
 .../msan/{check-handler.cc => check-handler.cpp}     |  0
 ...s_initialized.cc => check_mem_is_initialized.cpp} |  4 ++--
 .../msan/{coverage-levels.cc => coverage-levels.cpp} |  0
 compiler-rt/test/msan/{ctermid.cc => ctermid.cpp}    |  0
 .../test/msan/{cxa_atexit.cc => cxa_atexit.cpp}      |  0
 .../msan/{death-callback.cc => death-callback.cpp}   |  0
 .../{default_blacklist.cc => default_blacklist.cpp}  |  0
 compiler-rt/test/msan/{dlerror.cc => dlerror.cpp}    |  0
 .../{dlopen_executable.cc => dlopen_executable.cpp}  |  2 +-
 .../test/msan/{dso-origin.cc => dso-origin.cpp}      | 10 +++++-----
 .../{dtor-base-access.cc => dtor-base-access.cpp}    |  0
 .../msan/{dtor-bit-fields.cc => dtor-bit-fields.cpp} |  0
 ...{dtor-derived-class.cc => dtor-derived-class.cpp} |  0
 .../test/msan/{dtor-member.cc => dtor-member.cpp}    |  0
 ...ultiple-inheritance-nontrivial-class-members.cpp} |  0
 ...-inheritance.cc => dtor-multiple-inheritance.cpp} |  0
 ...ass-members.cc => dtor-trivial-class-members.cpp} |  0
 ...tance.cc => dtor-vtable-multiple-inheritance.cpp} |  0
 .../test/msan/{dtor-vtable.cc => dtor-vtable.cpp}    |  0
 compiler-rt/test/msan/{errno.cc => errno.cpp}        |  0
 .../test/msan/{fgets_fputs.cc => fgets_fputs.cpp}    |  0
 compiler-rt/test/msan/{fork.cc => fork.cpp}          |  0
 .../test/msan/{fread_fwrite.cc => fread_fwrite.cpp}  |  0
 compiler-rt/test/msan/{fstat.cc => fstat.cpp}        |  0
 compiler-rt/test/msan/{ftime.cc => ftime.cpp}        |  0
 ...addrinfo-positive.cc => getaddrinfo-positive.cpp} |  2 +-
 .../test/msan/{getaddrinfo.cc => getaddrinfo.cpp}    |  0
 compiler-rt/test/msan/{getline.cc => getline.cpp}    |  0
 .../test/msan/{getloadavg.cc => getloadavg.cpp}      |  0
 compiler-rt/test/msan/{getutent.cc => getutent.cpp}  |  0
 .../test/msan/{heap-origin.cc => heap-origin.cpp}    |  6 +++---
 .../{icmp_slt_allones.cc => icmp_slt_allones.cpp}    |  0
 compiler-rt/test/msan/{iconv.cc => iconv.cpp}        |  2 +-
 .../msan/{if_indextoname.cc => if_indextoname.cpp}   |  0
 compiler-rt/test/msan/{ifaddrs.cc => ifaddrs.cpp}    |  0
 .../test/msan/{initgroups.cc => initgroups.cpp}      |  0
 compiler-rt/test/msan/{inline.cc => inline.cpp}      |  0
 ...{insertvalue_origin.cc => insertvalue_origin.cpp} |  4 ++--
 compiler-rt/test/msan/{ioctl.cc => ioctl.cpp}        |  0
 .../test/msan/{ioctl_custom.cc => ioctl_custom.cpp}  |  2 +-
 .../test/msan/{memcmp_test.cc => memcmp_test.cpp}    |  0
 compiler-rt/test/msan/{mktime.cc => mktime.cpp}      |  2 +-
 compiler-rt/test/msan/{mmap.cc => mmap.cpp}          |  0
 .../{mmap_below_shadow.cc => mmap_below_shadow.cpp}  |  0
 ...tialized.cc => msan_check_mem_is_initialized.cpp} |  2 +-
 .../{msan_copy_shadow.cc => msan_copy_shadow.cpp}    |  6 +++---
 .../{msan_dump_shadow.cc => msan_dump_shadow.cpp}    |  0
 .../{msan_print_shadow.cc => msan_print_shadow.cpp}  | 12 ++++++------
 ...{msan_print_shadow2.cc => msan_print_shadow2.cpp} |  0
 ...{msan_print_shadow3.cc => msan_print_shadow3.cpp} |  0
 .../test/msan/{mul_by_const.cc => mul_by_const.cpp}  |  0
 ...{no_sanitize_memory.cc => no_sanitize_memory.cpp} |  0
 ...ze_memory_prop.cc => no_sanitize_memory_prop.cpp} |  0
 .../{origin-store-long.cc => origin-store-long.cpp}  |  4 ++--
 .../msan/{param_tls_limit.cc => param_tls_limit.cpp} |  0
 .../msan/{poison_in_free.cc => poison_in_free.cpp}   |  2 +-
 .../test/msan/{print_stats.cc => print_stats.cpp}    |  0
 ...p_deadlock.cc => pthread_getattr_np_deadlock.cpp} |  0
 ...{pthread_getname_np.cc => pthread_getname_np.cpp} |  0
 ..._setcancelstate.cc => pthread_setcancelstate.cpp} |  0
 compiler-rt/test/msan/{rand_r.cc => rand_r.cpp}      |  2 +-
 .../test/msan/{readdir64.cc => readdir64.cpp}        |  0
 ...lloc-large-origin.cc => realloc-large-origin.cpp} |  6 +++---
 .../msan/{realloc-origin.cc => realloc-origin.cpp}   |  4 ++--
 .../test/msan/{recover-dso.cc => recover-dso.cpp}    |  0
 compiler-rt/test/msan/{recover.cc => recover.cpp}    |  0
 .../{report-demangling.cc => report-demangling.cpp}  |  2 +-
 compiler-rt/test/msan/{scandir.cc => scandir.cpp}    |  0
 .../test/msan/{scandir_null.cc => scandir_null.cpp}  |  0
 ...coped-interceptors.cc => scoped-interceptors.cpp} |  0
 compiler-rt/test/msan/{select.cc => select.cpp}      |  4 ++--
 ...elect_float_origin.cc => select_float_origin.cpp} |  2 +-
 .../msan/{select_origin.cc => select_origin.cpp}     |  0
 .../test/msan/{sem_getvalue.cc => sem_getvalue.cpp}  |  0
 .../test/msan/{setlocale.cc => setlocale.cpp}        |  0
 .../test/msan/{sigaction.cc => sigaction.cpp}        |  0
 ...{signal_stress_test.cc => signal_stress_test.cpp} |  0
 compiler-rt/test/msan/{sigwait.cc => sigwait.cpp}    |  0
 .../test/msan/{sigwaitinfo.cc => sigwaitinfo.cpp}    |  0
 .../test/msan/{stack-origin.cc => stack-origin.cpp}  |  6 +++---
 .../msan/{stack-origin2.cc => stack-origin2.cpp}     |  6 +++---
 .../{strlen_of_shadow.cc => strlen_of_shadow.cpp}    |  0
 compiler-rt/test/msan/{strndup.cc => strndup.cpp}    |  4 ++--
 compiler-rt/test/msan/{strxfrm.cc => strxfrm.cpp}    |  0
 ...ck_set_and_test.cc => sync_lock_set_and_test.cpp} |  0
 .../test/msan/{textdomain.cc => textdomain.cpp}      |  0
 compiler-rt/test/msan/{times.cc => times.cpp}        |  0
 .../test/msan/{tls_reuse.cc => tls_reuse.cpp}        |  0
 compiler-rt/test/msan/{tsearch.cc => tsearch.cpp}    |  0
 compiler-rt/test/msan/{tzset.cc => tzset.cpp}        |  0
 ...gned_read_origin.cc => unaligned_read_origin.cpp} |  4 ++--
 .../msan/{unpoison_param.cc => unpoison_param.cpp}   |  0
 .../msan/{unpoison_string.cc => unpoison_string.cpp} |  0
 .../msan/{use-after-dtor.cc => use-after-dtor.cpp}   |  2 +-
 .../msan/{use-after-free.cc => use-after-free.cpp}   |  4 ++--
 compiler-rt/test/msan/{vararg.cc => vararg.cpp}      |  0
 .../test/msan/{vector_cvt.cc => vector_cvt.cpp}      |  2 +-
 .../test/msan/{vector_div.cc => vector_div.cpp}      |  0
 .../msan/{vector_select.cc => vector_select.cpp}     |  0
 compiler-rt/test/msan/{wcsncpy.cc => wcsncpy.cpp}    |  6 +++---
 compiler-rt/test/msan/{wcsxfrm.cc => wcsxfrm.cpp}    |  2 +-
 136 files changed, 78 insertions(+), 78 deletions(-)
 rename compiler-rt/test/msan/Linux/{bzero.cc => bzero.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{cmsghdr.cc => cmsghdr.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{eventfd.cc => eventfd.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{fopencookie.cc => fopencookie.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{forkpty.cc => forkpty.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{getresid.cc => getresid.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{glob.cc => glob.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{glob_altdirfunc.cc => glob_altdirfunc.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{glob_nomatch.cc => glob_nomatch.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{ioctl_sound.cc => ioctl_sound.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{mallinfo.cc => mallinfo.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{mincore.cc => mincore.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{name_to_handle_at.cc => name_to_handle_at.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{obstack.cc => obstack.cpp} (93%)
 rename compiler-rt/test/msan/Linux/{poll.cc => poll.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{process_vm_readv.cc => process_vm_readv.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{reexec_unlimited_stack.cc => reexec_unlimited_stack.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{sendmsg.cc => sendmsg.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{strerror_r.cc => strerror_r.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{sunrpc.cc => sunrpc.cpp} (96%)
 rename compiler-rt/test/msan/Linux/{sunrpc_bytes.cc => sunrpc_bytes.cpp} (94%)
 rename compiler-rt/test/msan/Linux/{sunrpc_string.cc => sunrpc_string.cpp} (93%)
 rename compiler-rt/test/msan/Linux/{syscalls.cc => syscalls.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{syscalls_sigaction.cc => syscalls_sigaction.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{tcgetattr.cc => tcgetattr.cpp} (100%)
 rename compiler-rt/test/msan/Linux/{xattr.cc => xattr.cpp} (100%)
 rename compiler-rt/test/msan/{__strxfrm_l.cc => __strxfrm_l.cpp} (100%)
 rename compiler-rt/test/msan/{alloca.cc => alloca.cpp} (100%)
 rename compiler-rt/test/msan/{allocator_mapping.cc => allocator_mapping.cpp} (100%)
 rename compiler-rt/test/msan/{backtrace.cc => backtrace.cpp} (100%)
 rename compiler-rt/test/msan/{chained_origin.cc => chained_origin.cpp} (71%)
 rename compiler-rt/test/msan/{chained_origin_empty_stack.cc => chained_origin_empty_stack.cpp} (100%)
 rename compiler-rt/test/msan/{chained_origin_limits.cc => chained_origin_limits.cpp} (100%)
 rename compiler-rt/test/msan/{chained_origin_memcpy.cc => chained_origin_memcpy.cpp} (81%)
 rename compiler-rt/test/msan/{chained_origin_with_signals.cc => chained_origin_with_signals.cpp} (100%)
 rename compiler-rt/test/msan/{check-handler.cc => check-handler.cpp} (100%)
 rename compiler-rt/test/msan/{check_mem_is_initialized.cc => check_mem_is_initialized.cpp} (94%)
 rename compiler-rt/test/msan/{coverage-levels.cc => coverage-levels.cpp} (100%)
 rename compiler-rt/test/msan/{ctermid.cc => ctermid.cpp} (100%)
 rename compiler-rt/test/msan/{cxa_atexit.cc => cxa_atexit.cpp} (100%)
 rename compiler-rt/test/msan/{death-callback.cc => death-callback.cpp} (100%)
 rename compiler-rt/test/msan/{default_blacklist.cc => default_blacklist.cpp} (100%)
 rename compiler-rt/test/msan/{dlerror.cc => dlerror.cpp} (100%)
 rename compiler-rt/test/msan/{dlopen_executable.cc => dlopen_executable.cpp} (85%)
 rename compiler-rt/test/msan/{dso-origin.cc => dso-origin.cpp} (79%)
 rename compiler-rt/test/msan/{dtor-base-access.cc => dtor-base-access.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-bit-fields.cc => dtor-bit-fields.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-derived-class.cc => dtor-derived-class.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-member.cc => dtor-member.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-multiple-inheritance-nontrivial-class-members.cc => dtor-multiple-inheritance-nontrivial-class-members.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-multiple-inheritance.cc => dtor-multiple-inheritance.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-trivial-class-members.cc => dtor-trivial-class-members.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-vtable-multiple-inheritance.cc => dtor-vtable-multiple-inheritance.cpp} (100%)
 rename compiler-rt/test/msan/{dtor-vtable.cc => dtor-vtable.cpp} (100%)
 rename compiler-rt/test/msan/{errno.cc => errno.cpp} (100%)
 rename compiler-rt/test/msan/{fgets_fputs.cc => fgets_fputs.cpp} (100%)
 rename compiler-rt/test/msan/{fork.cc => fork.cpp} (100%)
 rename compiler-rt/test/msan/{fread_fwrite.cc => fread_fwrite.cpp} (100%)
 rename compiler-rt/test/msan/{fstat.cc => fstat.cpp} (100%)
 rename compiler-rt/test/msan/{ftime.cc => ftime.cpp} (100%)
 rename compiler-rt/test/msan/{getaddrinfo-positive.cc => getaddrinfo-positive.cpp} (90%)
 rename compiler-rt/test/msan/{getaddrinfo.cc => getaddrinfo.cpp} (100%)
 rename compiler-rt/test/msan/{getline.cc => getline.cpp} (100%)
 rename compiler-rt/test/msan/{getloadavg.cc => getloadavg.cpp} (100%)
 rename compiler-rt/test/msan/{getutent.cc => getutent.cpp} (100%)
 rename compiler-rt/test/msan/{heap-origin.cc => heap-origin.cpp} (89%)
 rename compiler-rt/test/msan/{icmp_slt_allones.cc => icmp_slt_allones.cpp} (100%)
 rename compiler-rt/test/msan/{iconv.cc => iconv.cpp} (95%)
 rename compiler-rt/test/msan/{if_indextoname.cc => if_indextoname.cpp} (100%)
 rename compiler-rt/test/msan/{ifaddrs.cc => ifaddrs.cpp} (100%)
 rename compiler-rt/test/msan/{initgroups.cc => initgroups.cpp} (100%)
 rename compiler-rt/test/msan/{inline.cc => inline.cpp} (100%)
 rename compiler-rt/test/msan/{insertvalue_origin.cc => insertvalue_origin.cpp} (86%)
 rename compiler-rt/test/msan/{ioctl.cc => ioctl.cpp} (100%)
 rename compiler-rt/test/msan/{ioctl_custom.cc => ioctl_custom.cpp} (94%)
 rename compiler-rt/test/msan/{memcmp_test.cc => memcmp_test.cpp} (100%)
 rename compiler-rt/test/msan/{mktime.cc => mktime.cpp} (92%)
 rename compiler-rt/test/msan/{mmap.cc => mmap.cpp} (100%)
 rename compiler-rt/test/msan/{mmap_below_shadow.cc => mmap_below_shadow.cpp} (100%)
 rename compiler-rt/test/msan/{msan_check_mem_is_initialized.cc => msan_check_mem_is_initialized.cpp} (98%)
 rename compiler-rt/test/msan/{msan_copy_shadow.cc => msan_copy_shadow.cpp} (86%)
 rename compiler-rt/test/msan/{msan_dump_shadow.cc => msan_dump_shadow.cpp} (100%)
 rename compiler-rt/test/msan/{msan_print_shadow.cc => msan_print_shadow.cpp} (99%)
 rename compiler-rt/test/msan/{msan_print_shadow2.cc => msan_print_shadow2.cpp} (100%)
 rename compiler-rt/test/msan/{msan_print_shadow3.cc => msan_print_shadow3.cpp} (100%)
 rename compiler-rt/test/msan/{mul_by_const.cc => mul_by_const.cpp} (100%)
 rename compiler-rt/test/msan/{no_sanitize_memory.cc => no_sanitize_memory.cpp} (100%)
 rename compiler-rt/test/msan/{no_sanitize_memory_prop.cc => no_sanitize_memory_prop.cpp} (100%)
 rename compiler-rt/test/msan/{origin-store-long.cc => origin-store-long.cpp} (84%)
 rename compiler-rt/test/msan/{param_tls_limit.cc => param_tls_limit.cpp} (100%)
 rename compiler-rt/test/msan/{poison_in_free.cc => poison_in_free.cpp} (86%)
 rename compiler-rt/test/msan/{print_stats.cc => print_stats.cpp} (100%)
 rename compiler-rt/test/msan/{pthread_getattr_np_deadlock.cc => pthread_getattr_np_deadlock.cpp} (100%)
 rename compiler-rt/test/msan/{pthread_getname_np.cc => pthread_getname_np.cpp} (100%)
 rename compiler-rt/test/msan/{pthread_setcancelstate.cc => pthread_setcancelstate.cpp} (100%)
 rename compiler-rt/test/msan/{rand_r.cc => rand_r.cpp} (88%)
 rename compiler-rt/test/msan/{readdir64.cc => readdir64.cpp} (100%)
 rename compiler-rt/test/msan/{realloc-large-origin.cc => realloc-large-origin.cpp} (86%)
 rename compiler-rt/test/msan/{realloc-origin.cc => realloc-origin.cpp} (83%)
 rename compiler-rt/test/msan/{recover-dso.cc => recover-dso.cpp} (100%)
 rename compiler-rt/test/msan/{recover.cc => recover.cpp} (100%)
 rename compiler-rt/test/msan/{report-demangling.cc => report-demangling.cpp} (89%)
 rename compiler-rt/test/msan/{scandir.cc => scandir.cpp} (100%)
 rename compiler-rt/test/msan/{scandir_null.cc => scandir_null.cpp} (100%)
 rename compiler-rt/test/msan/{scoped-interceptors.cc => scoped-interceptors.cpp} (100%)
 rename compiler-rt/test/msan/{select.cc => select.cpp} (88%)
 rename compiler-rt/test/msan/{select_float_origin.cc => select_float_origin.cpp} (91%)
 rename compiler-rt/test/msan/{select_origin.cc => select_origin.cpp} (100%)
 rename compiler-rt/test/msan/{sem_getvalue.cc => sem_getvalue.cpp} (100%)
 rename compiler-rt/test/msan/{setlocale.cc => setlocale.cpp} (100%)
 rename compiler-rt/test/msan/{sigaction.cc => sigaction.cpp} (100%)
 rename compiler-rt/test/msan/{signal_stress_test.cc => signal_stress_test.cpp} (100%)
 rename compiler-rt/test/msan/{sigwait.cc => sigwait.cpp} (100%)
 rename compiler-rt/test/msan/{sigwaitinfo.cc => sigwaitinfo.cpp} (100%)
 rename compiler-rt/test/msan/{stack-origin.cc => stack-origin.cpp} (89%)
 rename compiler-rt/test/msan/{stack-origin2.cc => stack-origin2.cpp} (90%)
 rename compiler-rt/test/msan/{strlen_of_shadow.cc => strlen_of_shadow.cpp} (100%)
 rename compiler-rt/test/msan/{strndup.cc => strndup.cpp} (91%)
 rename compiler-rt/test/msan/{strxfrm.cc => strxfrm.cpp} (100%)
 rename compiler-rt/test/msan/{sync_lock_set_and_test.cc => sync_lock_set_and_test.cpp} (100%)
 rename compiler-rt/test/msan/{textdomain.cc => textdomain.cpp} (100%)
 rename compiler-rt/test/msan/{times.cc => times.cpp} (100%)
 rename compiler-rt/test/msan/{tls_reuse.cc => tls_reuse.cpp} (100%)
 rename compiler-rt/test/msan/{tsearch.cc => tsearch.cpp} (100%)
 rename compiler-rt/test/msan/{tzset.cc => tzset.cpp} (100%)
 rename compiler-rt/test/msan/{unaligned_read_origin.cc => unaligned_read_origin.cpp} (81%)
 rename compiler-rt/test/msan/{unpoison_param.cc => unpoison_param.cpp} (100%)
 rename compiler-rt/test/msan/{unpoison_string.cc => unpoison_string.cpp} (100%)
 rename compiler-rt/test/msan/{use-after-dtor.cc => use-after-dtor.cpp} (96%)
 rename compiler-rt/test/msan/{use-after-free.cc => use-after-free.cpp} (91%)
 rename compiler-rt/test/msan/{vararg.cc => vararg.cpp} (100%)
 rename compiler-rt/test/msan/{vector_cvt.cc => vector_cvt.cpp} (88%)
 rename compiler-rt/test/msan/{vector_div.cc => vector_div.cpp} (100%)
 rename compiler-rt/test/msan/{vector_select.cc => vector_select.cpp} (100%)
 rename compiler-rt/test/msan/{wcsncpy.cc => wcsncpy.cpp} (90%)
 rename compiler-rt/test/msan/{wcsxfrm.cc => wcsxfrm.cpp} (94%)

diff --git a/compiler-rt/test/msan/Linux/bzero.cc b/compiler-rt/test/msan/Linux/bzero.cpp
similarity index 100%
rename from compiler-rt/test/msan/Linux/bzero.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/cmsghdr.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/eventfd.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/fopencookie.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/forkpty.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/getresid.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/glob.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/glob_altdirfunc.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/glob_nomatch.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/ioctl_sound.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/mallinfo.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/mincore.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/name_to_handle_at.cc
rename to 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
similarity index 93%
rename from compiler-rt/test/msan/Linux/obstack.cc
rename to compiler-rt/test/msan/Linux/obstack.cpp
index 0a81d87..b328cc7 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/poll.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/process_vm_readv.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/reexec_unlimited_stack.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/sendmsg.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/strerror_r.cc
rename to 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
similarity index 96%
rename from compiler-rt/test/msan/Linux/sunrpc.cc
rename to compiler-rt/test/msan/Linux/sunrpc.cpp
index edf49c2..8828bfd 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
similarity index 94%
rename from compiler-rt/test/msan/Linux/sunrpc_bytes.cc
rename to compiler-rt/test/msan/Linux/sunrpc_bytes.cpp
index 7eb47e1..7806e6e 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
similarity index 93%
rename from compiler-rt/test/msan/Linux/sunrpc_string.cc
rename to compiler-rt/test/msan/Linux/sunrpc_string.cpp
index 723b855..76b53a7 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/syscalls.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/syscalls_sigaction.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/tcgetattr.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/Linux/xattr.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/__strxfrm_l.cc
rename to compiler-rt/test/msan/__strxfrm_l.cpp
diff --git a/compiler-rt/test/msan/alloca.cc b/compiler-rt/test/msan/alloca.cpp
similarity index 100%
rename from compiler-rt/test/msan/alloca.cc
rename to compiler-rt/test/msan/alloca.cpp
diff --git a/compiler-rt/test/msan/allocator_mapping.cc b/compiler-rt/test/msan/allocator_mapping.cpp
similarity index 100%
rename from compiler-rt/test/msan/allocator_mapping.cc
rename to compiler-rt/test/msan/allocator_mapping.cpp
diff --git a/compiler-rt/test/msan/backtrace.cc b/compiler-rt/test/msan/backtrace.cpp
similarity index 100%
rename from compiler-rt/test/msan/backtrace.cc
rename to compiler-rt/test/msan/backtrace.cpp
diff --git a/compiler-rt/test/msan/chained_origin.cc b/compiler-rt/test/msan/chained_origin.cpp
similarity index 71%
rename from compiler-rt/test/msan/chained_origin.cc
rename to compiler-rt/test/msan/chained_origin.cpp
index 7cab152..c16b879 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
similarity index 100%
rename from compiler-rt/test/msan/chained_origin_empty_stack.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/chained_origin_limits.cc
rename to 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
similarity index 81%
rename from compiler-rt/test/msan/chained_origin_memcpy.cc
rename to compiler-rt/test/msan/chained_origin_memcpy.cpp
index a950a036..47a0eff 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
similarity index 100%
rename from compiler-rt/test/msan/chained_origin_with_signals.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/check-handler.cc
rename to 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
similarity index 94%
rename from compiler-rt/test/msan/check_mem_is_initialized.cc
rename to compiler-rt/test/msan/check_mem_is_initialized.cpp
index e1d3b11..b855237 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
similarity index 100%
rename from compiler-rt/test/msan/coverage-levels.cc
rename to compiler-rt/test/msan/coverage-levels.cpp
diff --git a/compiler-rt/test/msan/ctermid.cc b/compiler-rt/test/msan/ctermid.cpp
similarity index 100%
rename from compiler-rt/test/msan/ctermid.cc
rename to compiler-rt/test/msan/ctermid.cpp
diff --git a/compiler-rt/test/msan/cxa_atexit.cc b/compiler-rt/test/msan/cxa_atexit.cpp
similarity index 100%
rename from compiler-rt/test/msan/cxa_atexit.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/death-callback.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/default_blacklist.cc
rename to compiler-rt/test/msan/default_blacklist.cpp
diff --git a/compiler-rt/test/msan/dlerror.cc b/compiler-rt/test/msan/dlerror.cpp
similarity index 100%
rename from compiler-rt/test/msan/dlerror.cc
rename to compiler-rt/test/msan/dlerror.cpp
diff --git a/compiler-rt/test/msan/dlopen_executable.cc b/compiler-rt/test/msan/dlopen_executable.cpp
similarity index 85%
rename from compiler-rt/test/msan/dlopen_executable.cc
rename to compiler-rt/test/msan/dlopen_executable.cpp
index ac8a14b..393e871 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
similarity index 79%
rename from compiler-rt/test/msan/dso-origin.cc
rename to compiler-rt/test/msan/dso-origin.cpp
index 7f62449..4cc86dc 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-base-access.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-bit-fields.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-derived-class.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-member.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-multiple-inheritance-nontrivial-class-members.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-multiple-inheritance.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-trivial-class-members.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-vtable-multiple-inheritance.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/dtor-vtable.cc
rename to compiler-rt/test/msan/dtor-vtable.cpp
diff --git a/compiler-rt/test/msan/errno.cc b/compiler-rt/test/msan/errno.cpp
similarity index 100%
rename from compiler-rt/test/msan/errno.cc
rename to compiler-rt/test/msan/errno.cpp
diff --git a/compiler-rt/test/msan/fgets_fputs.cc b/compiler-rt/test/msan/fgets_fputs.cpp
similarity index 100%
rename from compiler-rt/test/msan/fgets_fputs.cc
rename to compiler-rt/test/msan/fgets_fputs.cpp
diff --git a/compiler-rt/test/msan/fork.cc b/compiler-rt/test/msan/fork.cpp
similarity index 100%
rename from compiler-rt/test/msan/fork.cc
rename to compiler-rt/test/msan/fork.cpp
diff --git a/compiler-rt/test/msan/fread_fwrite.cc b/compiler-rt/test/msan/fread_fwrite.cpp
similarity index 100%
rename from compiler-rt/test/msan/fread_fwrite.cc
rename to compiler-rt/test/msan/fread_fwrite.cpp
diff --git a/compiler-rt/test/msan/fstat.cc b/compiler-rt/test/msan/fstat.cpp
similarity index 100%
rename from compiler-rt/test/msan/fstat.cc
rename to compiler-rt/test/msan/fstat.cpp
diff --git a/compiler-rt/test/msan/ftime.cc b/compiler-rt/test/msan/ftime.cpp
similarity index 100%
rename from compiler-rt/test/msan/ftime.cc
rename to compiler-rt/test/msan/ftime.cpp
diff --git a/compiler-rt/test/msan/getaddrinfo-positive.cc b/compiler-rt/test/msan/getaddrinfo-positive.cpp
similarity index 90%
rename from compiler-rt/test/msan/getaddrinfo-positive.cc
rename to compiler-rt/test/msan/getaddrinfo-positive.cpp
index 45c1b60..891fcf8 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
similarity index 100%
rename from compiler-rt/test/msan/getaddrinfo.cc
rename to compiler-rt/test/msan/getaddrinfo.cpp
diff --git a/compiler-rt/test/msan/getline.cc b/compiler-rt/test/msan/getline.cpp
similarity index 100%
rename from compiler-rt/test/msan/getline.cc
rename to compiler-rt/test/msan/getline.cpp
diff --git a/compiler-rt/test/msan/getloadavg.cc b/compiler-rt/test/msan/getloadavg.cpp
similarity index 100%
rename from compiler-rt/test/msan/getloadavg.cc
rename to compiler-rt/test/msan/getloadavg.cpp
diff --git a/compiler-rt/test/msan/getutent.cc b/compiler-rt/test/msan/getutent.cpp
similarity index 100%
rename from compiler-rt/test/msan/getutent.cc
rename to compiler-rt/test/msan/getutent.cpp
diff --git a/compiler-rt/test/msan/heap-origin.cc b/compiler-rt/test/msan/heap-origin.cpp
similarity index 89%
rename from compiler-rt/test/msan/heap-origin.cc
rename to compiler-rt/test/msan/heap-origin.cpp
index 4f170f0..5fd9084 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
similarity index 100%
rename from compiler-rt/test/msan/icmp_slt_allones.cc
rename to compiler-rt/test/msan/icmp_slt_allones.cpp
diff --git a/compiler-rt/test/msan/iconv.cc b/compiler-rt/test/msan/iconv.cpp
similarity index 95%
rename from compiler-rt/test/msan/iconv.cc
rename to compiler-rt/test/msan/iconv.cpp
index 7713cb8..e2d08e9 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
similarity index 100%
rename from compiler-rt/test/msan/if_indextoname.cc
rename to compiler-rt/test/msan/if_indextoname.cpp
diff --git a/compiler-rt/test/msan/ifaddrs.cc b/compiler-rt/test/msan/ifaddrs.cpp
similarity index 100%
rename from compiler-rt/test/msan/ifaddrs.cc
rename to compiler-rt/test/msan/ifaddrs.cpp
diff --git a/compiler-rt/test/msan/initgroups.cc b/compiler-rt/test/msan/initgroups.cpp
similarity index 100%
rename from compiler-rt/test/msan/initgroups.cc
rename to compiler-rt/test/msan/initgroups.cpp
diff --git a/compiler-rt/test/msan/inline.cc b/compiler-rt/test/msan/inline.cpp
similarity index 100%
rename from compiler-rt/test/msan/inline.cc
rename to compiler-rt/test/msan/inline.cpp
diff --git a/compiler-rt/test/msan/insertvalue_origin.cc b/compiler-rt/test/msan/insertvalue_origin.cpp
similarity index 86%
rename from compiler-rt/test/msan/insertvalue_origin.cc
rename to compiler-rt/test/msan/insertvalue_origin.cpp
index a0c7002..68e7d9a 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
similarity index 100%
rename from compiler-rt/test/msan/ioctl.cc
rename to compiler-rt/test/msan/ioctl.cpp
diff --git a/compiler-rt/test/msan/ioctl_custom.cc b/compiler-rt/test/msan/ioctl_custom.cpp
similarity index 94%
rename from compiler-rt/test/msan/ioctl_custom.cc
rename to compiler-rt/test/msan/ioctl_custom.cpp
index 794f345..c01a6c8 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
similarity index 100%
rename from compiler-rt/test/msan/memcmp_test.cc
rename to compiler-rt/test/msan/memcmp_test.cpp
diff --git a/compiler-rt/test/msan/mktime.cc b/compiler-rt/test/msan/mktime.cpp
similarity index 92%
rename from compiler-rt/test/msan/mktime.cc
rename to compiler-rt/test/msan/mktime.cpp
index 997fb0d..7d4d929 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
similarity index 100%
rename from compiler-rt/test/msan/mmap.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/mmap_below_shadow.cc
rename to 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
similarity index 98%
rename from compiler-rt/test/msan/msan_check_mem_is_initialized.cc
rename to compiler-rt/test/msan/msan_check_mem_is_initialized.cpp
index 2991501..81f7895 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
similarity index 86%
rename from compiler-rt/test/msan/msan_copy_shadow.cc
rename to compiler-rt/test/msan/msan_copy_shadow.cpp
index cc7ec03..a3ec39c 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
similarity index 100%
rename from compiler-rt/test/msan/msan_dump_shadow.cc
rename to 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
similarity index 99%
rename from compiler-rt/test/msan/msan_print_shadow.cc
rename to compiler-rt/test/msan/msan_print_shadow.cpp
index 9668be2..bdee310 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
similarity index 100%
rename from compiler-rt/test/msan/msan_print_shadow2.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/msan_print_shadow3.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/mul_by_const.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/no_sanitize_memory.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/no_sanitize_memory_prop.cc
rename to 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
similarity index 84%
rename from compiler-rt/test/msan/origin-store-long.cc
rename to compiler-rt/test/msan/origin-store-long.cpp
index 5c9fe04..ece0503 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
similarity index 100%
rename from compiler-rt/test/msan/param_tls_limit.cc
rename to 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
similarity index 86%
rename from compiler-rt/test/msan/poison_in_free.cc
rename to compiler-rt/test/msan/poison_in_free.cpp
index 16e2124c3..e144c14 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
similarity index 100%
rename from compiler-rt/test/msan/print_stats.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/pthread_getattr_np_deadlock.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/pthread_getname_np.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/pthread_setcancelstate.cc
rename to 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
similarity index 88%
rename from compiler-rt/test/msan/rand_r.cc
rename to compiler-rt/test/msan/rand_r.cpp
index f40cf9f..d83c43a 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
similarity index 100%
rename from compiler-rt/test/msan/readdir64.cc
rename to 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
similarity index 86%
rename from compiler-rt/test/msan/realloc-large-origin.cc
rename to compiler-rt/test/msan/realloc-large-origin.cpp
index 6893c1d..b19fb60 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
similarity index 83%
rename from compiler-rt/test/msan/realloc-origin.cc
rename to compiler-rt/test/msan/realloc-origin.cpp
index e689371..5bcedda 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
similarity index 100%
rename from compiler-rt/test/msan/recover-dso.cc
rename to compiler-rt/test/msan/recover-dso.cpp
diff --git a/compiler-rt/test/msan/recover.cc b/compiler-rt/test/msan/recover.cpp
similarity index 100%
rename from compiler-rt/test/msan/recover.cc
rename to compiler-rt/test/msan/recover.cpp
diff --git a/compiler-rt/test/msan/report-demangling.cc b/compiler-rt/test/msan/report-demangling.cpp
similarity index 89%
rename from compiler-rt/test/msan/report-demangling.cc
rename to compiler-rt/test/msan/report-demangling.cpp
index fbb6554..9ef6113 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
similarity index 100%
rename from compiler-rt/test/msan/scandir.cc
rename to compiler-rt/test/msan/scandir.cpp
diff --git a/compiler-rt/test/msan/scandir_null.cc b/compiler-rt/test/msan/scandir_null.cpp
similarity index 100%
rename from compiler-rt/test/msan/scandir_null.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/scoped-interceptors.cc
rename to compiler-rt/test/msan/scoped-interceptors.cpp
diff --git a/compiler-rt/test/msan/select.cc b/compiler-rt/test/msan/select.cpp
similarity index 88%
rename from compiler-rt/test/msan/select.cc
rename to compiler-rt/test/msan/select.cpp
index 7b8c347..1a2d3ec 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
similarity index 91%
rename from compiler-rt/test/msan/select_float_origin.cc
rename to compiler-rt/test/msan/select_float_origin.cpp
index 75731dc..730b18c 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
similarity index 100%
rename from compiler-rt/test/msan/select_origin.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/sem_getvalue.cc
rename to compiler-rt/test/msan/sem_getvalue.cpp
diff --git a/compiler-rt/test/msan/setlocale.cc b/compiler-rt/test/msan/setlocale.cpp
similarity index 100%
rename from compiler-rt/test/msan/setlocale.cc
rename to compiler-rt/test/msan/setlocale.cpp
diff --git a/compiler-rt/test/msan/sigaction.cc b/compiler-rt/test/msan/sigaction.cpp
similarity index 100%
rename from compiler-rt/test/msan/sigaction.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/signal_stress_test.cc
rename to compiler-rt/test/msan/signal_stress_test.cpp
diff --git a/compiler-rt/test/msan/sigwait.cc b/compiler-rt/test/msan/sigwait.cpp
similarity index 100%
rename from compiler-rt/test/msan/sigwait.cc
rename to compiler-rt/test/msan/sigwait.cpp
diff --git a/compiler-rt/test/msan/sigwaitinfo.cc b/compiler-rt/test/msan/sigwaitinfo.cpp
similarity index 100%
rename from compiler-rt/test/msan/sigwaitinfo.cc
rename to compiler-rt/test/msan/sigwaitinfo.cpp
diff --git a/compiler-rt/test/msan/stack-origin.cc b/compiler-rt/test/msan/stack-origin.cpp
similarity index 89%
rename from compiler-rt/test/msan/stack-origin.cc
rename to compiler-rt/test/msan/stack-origin.cpp
index e69c072..3e31526 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
similarity index 90%
rename from compiler-rt/test/msan/stack-origin2.cc
rename to compiler-rt/test/msan/stack-origin2.cpp
index 6c7428c..2ef3e18 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
similarity index 100%
rename from compiler-rt/test/msan/strlen_of_shadow.cc
rename to compiler-rt/test/msan/strlen_of_shadow.cpp
diff --git a/compiler-rt/test/msan/strndup.cc b/compiler-rt/test/msan/strndup.cpp
similarity index 91%
rename from compiler-rt/test/msan/strndup.cc
rename to compiler-rt/test/msan/strndup.cpp
index 07bdd9f..c9d425c 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
similarity index 100%
rename from compiler-rt/test/msan/strxfrm.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/sync_lock_set_and_test.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/textdomain.cc
rename to compiler-rt/test/msan/textdomain.cpp
diff --git a/compiler-rt/test/msan/times.cc b/compiler-rt/test/msan/times.cpp
similarity index 100%
rename from compiler-rt/test/msan/times.cc
rename to compiler-rt/test/msan/times.cpp
diff --git a/compiler-rt/test/msan/tls_reuse.cc b/compiler-rt/test/msan/tls_reuse.cpp
similarity index 100%
rename from compiler-rt/test/msan/tls_reuse.cc
rename to compiler-rt/test/msan/tls_reuse.cpp
diff --git a/compiler-rt/test/msan/tsearch.cc b/compiler-rt/test/msan/tsearch.cpp
similarity index 100%
rename from compiler-rt/test/msan/tsearch.cc
rename to compiler-rt/test/msan/tsearch.cpp
diff --git a/compiler-rt/test/msan/tzset.cc b/compiler-rt/test/msan/tzset.cpp
similarity index 100%
rename from compiler-rt/test/msan/tzset.cc
rename to 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
similarity index 81%
rename from compiler-rt/test/msan/unaligned_read_origin.cc
rename to compiler-rt/test/msan/unaligned_read_origin.cpp
index b04800a..cf25122 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
similarity index 100%
rename from compiler-rt/test/msan/unpoison_param.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/unpoison_string.cc
rename to 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
similarity index 96%
rename from compiler-rt/test/msan/use-after-dtor.cc
rename to compiler-rt/test/msan/use-after-dtor.cpp
index 45f4dcd..7566ab7 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
similarity index 91%
rename from compiler-rt/test/msan/use-after-free.cc
rename to compiler-rt/test/msan/use-after-free.cpp
index c505124..4884bef 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
similarity index 100%
rename from compiler-rt/test/msan/vararg.cc
rename to compiler-rt/test/msan/vararg.cpp
diff --git a/compiler-rt/test/msan/vector_cvt.cc b/compiler-rt/test/msan/vector_cvt.cpp
similarity index 88%
rename from compiler-rt/test/msan/vector_cvt.cc
rename to compiler-rt/test/msan/vector_cvt.cpp
index 5541436..aa5327e 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
similarity index 100%
rename from compiler-rt/test/msan/vector_div.cc
rename to 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
similarity index 100%
rename from compiler-rt/test/msan/vector_select.cc
rename to compiler-rt/test/msan/vector_select.cpp
diff --git a/compiler-rt/test/msan/wcsncpy.cc b/compiler-rt/test/msan/wcsncpy.cpp
similarity index 90%
rename from compiler-rt/test/msan/wcsncpy.cc
rename to compiler-rt/test/msan/wcsncpy.cpp
index 6471371..f448ab2 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
similarity index 94%
rename from compiler-rt/test/msan/wcsxfrm.cc
rename to compiler-rt/test/msan/wcsxfrm.cpp
index f13c5d3..54e13a1 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;
 }
-- 
2.7.4