22 files changed, 43 insertions, 38 deletions
diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index bf8e0fdb977..00d811a5b69 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -91,9 +91,9 @@ run_lint ${ASAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/asan/*/*.cc &
 TSAN_RTL=${COMPILER_RT}/lib/tsan
 run_lint ${TSAN_RTL_LINT_FILTER} ${TSAN_RTL}/rtl/*.cpp \
                                  ${TSAN_RTL}/rtl/*.h &
-run_lint ${TSAN_TEST_LINT_FILTER} ${TSAN_RTL}/tests/rtl/*.cc \
+run_lint ${TSAN_TEST_LINT_FILTER} ${TSAN_RTL}/tests/rtl/*.cpp \
                                   ${TSAN_RTL}/tests/rtl/*.h \
-                                  ${TSAN_RTL}/tests/unit/*.cc &
+                                  ${TSAN_RTL}/tests/unit/*.cpp &
 run_lint ${TSAN_LIT_TEST_LINT_FILTER} ${LIT_TESTS}/tsan/*.cc &
 
 # MSan
diff --git a/compiler-rt/lib/tsan/rtl/tsan_clock.cpp b/compiler-rt/lib/tsan/rtl/tsan_clock.cpp
index 0db3737d696..4b7aa0653da 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_clock.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_clock.cpp
@@ -40,7 +40,7 @@
 //     release(dst);
 //   }
 //
-// Conformance to this model is extensively verified in tsan_clock_test.cc.
+// Conformance to this model is extensively verified in tsan_clock_test.cpp.
 // However, the implementation is significantly more complex. The complexity
 // allows to implement important classes of use cases in O(1) instead of O(N).
 //
diff --git a/compiler-rt/lib/tsan/tests/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/tests/rtl/CMakeLists.txt
index a34f08ea965..92cec3ee41b 100644
--- a/compiler-rt/lib/tsan/tests/rtl/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/tests/rtl/CMakeLists.txt
@@ -1,18 +1,22 @@
 set(TSAN_RTL_TEST_SOURCES
-  tsan_bench.cc
-  tsan_mop.cc
-  tsan_mutex.cc
-  tsan_posix.cc
-  tsan_string.cc
-  tsan_test.cc
-  tsan_thread.cc)
+  tsan_bench.cpp
+  tsan_mop.cpp
+  tsan_mutex.cpp
+  tsan_posix.cpp
+  tsan_string.cpp
+  tsan_test.cpp
+  tsan_thread.cpp
+  )
 
 if(UNIX)
-  list(APPEND TSAN_RTL_TEST_SOURCES tsan_test_util_posix.cc)
+  list(APPEND TSAN_RTL_TEST_SOURCES
+    tsan_test_util_posix.cpp
+    )
 endif()
 
 set(TSAN_RTL_TEST_HEADERS
-  tsan_test_util.h)
+  tsan_test_util.h
+  )
 
 add_tsan_unittest(TsanRtlTest
   SOURCES ${TSAN_RTL_TEST_SOURCES}
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_bench.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_bench.cpp
index 0135101142f..36ca9b5e035 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_bench.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_bench.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_bench.cc -----------------------------------------------------===//
+//===-- tsan_bench.cpp ----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_mop.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_mop.cpp
index a5b0bdda3cf..1825c96d743 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_mop.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_mop.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_mop.cc -------------------------------------------------------===//
+//===-- tsan_mop.cpp ------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_mutex.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_mutex.cpp
index af12e20b148..dae9c94c339 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_mutex.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_mutex.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_mutex.cc -----------------------------------------------------===//
+//===-- tsan_mutex.cpp ----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_posix.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_posix.cpp
index d1940452cc8..0eb8dc14df7 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_posix.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_posix.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_posix.cc -----------------------------------------------------===//
+//===-- tsan_posix.cpp ----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_string.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_string.cpp
index b236d46310e..4c31389298a 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_string.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_string.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_string.cc ----------------------------------------------------===//
+//===-- tsan_string.cpp ---------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cpp
index 51a3b273114..84e6bbcfe47 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_test.cc ------------------------------------------------------===//
+//===-- tsan_test.cpp -----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_posix.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_posix.cpp
index 767c8294dbd..73c7e9235d0 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_posix.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_posix.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_test_util_posix.cc -------------------------------------------===//
+//===-- tsan_test_util_posix.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_thread.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_thread.cpp
index 9e2da912e9b..9d79e0e9429 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_thread.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_thread.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_thread.cc ----------------------------------------------------===//
+//===-- tsan_thread.cpp ---------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/CMakeLists.txt b/compiler-rt/lib/tsan/tests/unit/CMakeLists.txt
index c08508d5079..79e334a2c66 100644
--- a/compiler-rt/lib/tsan/tests/unit/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/tests/unit/CMakeLists.txt
@@ -1,12 +1,13 @@
 set(TSAN_UNIT_TEST_SOURCES
-  tsan_clock_test.cc
-  tsan_flags_test.cc
-  tsan_mman_test.cc
-  tsan_mutex_test.cc
-  tsan_shadow_test.cc
-  tsan_stack_test.cc
-  tsan_sync_test.cc
-  tsan_unit_test_main.cc)
+  tsan_clock_test.cpp
+  tsan_flags_test.cpp
+  tsan_mman_test.cpp
+  tsan_mutex_test.cpp
+  tsan_shadow_test.cpp
+  tsan_stack_test.cpp
+  tsan_sync_test.cpp
+  tsan_unit_test_main.cpp
+  )
 
 add_tsan_unittest(TsanUnitTest
   SOURCES ${TSAN_UNIT_TEST_SOURCES})
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
index 43d0a012c96..6d835ba85c3 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_clock_test.cc ------------------------------------------------===//
+//===-- tsan_clock_test.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_dense_alloc_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_dense_alloc_test.cpp
index 8c544b0d737..05045622881 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_dense_alloc_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_dense_alloc_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_dense_alloc_test.cc ------------------------------------------===//
+//===-- tsan_dense_alloc_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_flags_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_flags_test.cpp
index ebdb28f6dff..ace760071e9 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_flags_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_flags_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_flags_test.cc ------------------------------------------------===//
+//===-- tsan_flags_test.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cpp
index b2789b70fc7..a8a88b37abe 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_mman_test.cc -------------------------------------------------===//
+//===-- tsan_mman_test.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_mutex_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_mutex_test.cpp
index 0649c8aa589..cb29a7cc0e6 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_mutex_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_mutex_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_mutex_test.cc ------------------------------------------------===//
+//===-- tsan_mutex_test.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_mutexset_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_mutexset_test.cpp
index 5862138a82f..2b531b021fc 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_mutexset_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_mutexset_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_mutexset_test.cc ---------------------------------------------===//
+//===-- tsan_mutexset_test.cpp --------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_shadow_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_shadow_test.cpp
index 21a4ddf973b..1d2023f6ad2 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_shadow_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_shadow_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_shadow_test.cc -----------------------------------------------===//
+//===-- tsan_shadow_test.cpp ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_stack_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_stack_test.cpp
index d8b81d33123..f2ee1265c31 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_stack_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_stack_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_stack_test.cc ------------------------------------------------===//
+//===-- tsan_stack_test.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_sync_test.cc b/compiler-rt/lib/tsan/tests/unit/tsan_sync_test.cpp
index 7ea2826e8a5..825cc0943e8 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_sync_test.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_sync_test.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_sync_test.cc -------------------------------------------------===//
+//===-- tsan_sync_test.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/tests/unit/tsan_unit_test_main.cc b/compiler-rt/lib/tsan/tests/unit/tsan_unit_test_main.cpp
index a1487310f0a..0e7b18a2ab3 100644
--- a/compiler-rt/lib/tsan/tests/unit/tsan_unit_test_main.cc
+++ b/compiler-rt/lib/tsan/tests/unit/tsan_unit_test_main.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_unit_test_main.cc --------------------------------------------===//
+//===-- tsan_unit_test_main.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.