[compiler-rt] 6538aa8 - [NFC][tsan] Rename _inl.h to .inc

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-08-03T09:35:33-07:00
New Revision: 6538aa8ce9b0806f0d343e0029c9a982d5971092

URL: https://github.com/llvm/llvm-project/commit/6538aa8ce9b0806f0d343e0029c9a982d5971092
DIFF: https://github.com/llvm/llvm-project/commit/6538aa8ce9b0806f0d343e0029c9a982d5971092.diff

LOG: [NFC][tsan] Rename _inl.h to .inc

Differential Revision: https://reviews.llvm.org/D107319

Added: 
    compiler-rt/lib/tsan/rtl/tsan_interface.inc
    compiler-rt/lib/tsan/rtl/tsan_update_shadow_word.inc

Modified: 
    compiler-rt/lib/tsan/CMakeLists.txt
    compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
    llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn

Removed: 
    compiler-rt/lib/tsan/rtl/tsan_interface_inl.h
    compiler-rt/lib/tsan/rtl/tsan_update_shadow_word_inl.h


################################################################################
diff  --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt
index 10091e611b157..ea975f7f9c56b 100644
--- a/compiler-rt/lib/tsan/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/CMakeLists.txt
@@ -91,8 +91,8 @@ set(TSAN_HEADERS
   rtl/tsan_ilist.h
   rtl/tsan_interceptors.h
   rtl/tsan_interface.h
+  rtl/tsan_interface.inc
   rtl/tsan_interface_ann.h
-  rtl/tsan_interface_inl.h
   rtl/tsan_interface_java.h
   rtl/tsan_mman.h
   rtl/tsan_mutexset.h
@@ -105,7 +105,7 @@ set(TSAN_HEADERS
   rtl/tsan_symbolize.h
   rtl/tsan_sync.h
   rtl/tsan_trace.h
-  rtl/tsan_update_shadow_word_inl.h
+  rtl/tsan_update_shadow_word.inc
   rtl/tsan_vector_clock.h
   )
 

diff  --git a/compiler-rt/lib/tsan/rtl/tsan_interface_inl.h b/compiler-rt/lib/tsan/rtl/tsan_interface.inc
similarity index 98%
rename from compiler-rt/lib/tsan/rtl/tsan_interface_inl.h
rename to compiler-rt/lib/tsan/rtl/tsan_interface.inc
index 11c9fde5c76eb..acc80b497a859 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_inl.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface.inc
@@ -1,4 +1,4 @@
-//===-- tsan_interface_inl.h ------------------------------------*- C++ -*-===//
+//===-- tsan_interface.inc --------------------------------------*- C++ -*-===//
 //
 // 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/rtl/tsan_rtl.cpp b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
index 98512c0cc2100..46abdead5971b 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
@@ -696,28 +696,28 @@ void MemoryAccessImpl1(ThreadState *thr, uptr addr,
   // threads, which is not enough for the unrolled loop.
 #if SANITIZER_DEBUG
   for (int idx = 0; idx < 4; idx++) {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   }
 #else
   int idx = 0;
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   idx = 1;
   if (stored) {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   } else {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   }
   idx = 2;
   if (stored) {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   } else {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   }
   idx = 3;
   if (stored) {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   } else {
-#  include "tsan_update_shadow_word_inl.h"
+#  include "tsan_update_shadow_word.inc"
   }
 #endif
 
@@ -1140,5 +1140,5 @@ void PrintMutexPC(uptr pc) { StackTrace(&pc, 1).Print(); }
 
 #if !SANITIZER_GO
 // Must be included in this file to make sure everything is inlined.
-#  include "tsan_interface_inl.h"
+#  include "tsan_interface.inc"
 #endif

diff  --git a/compiler-rt/lib/tsan/rtl/tsan_update_shadow_word_inl.h b/compiler-rt/lib/tsan/rtl/tsan_update_shadow_word.inc
similarity index 96%
rename from compiler-rt/lib/tsan/rtl/tsan_update_shadow_word_inl.h
rename to compiler-rt/lib/tsan/rtl/tsan_update_shadow_word.inc
index d23dfb0ba061c..a58ef0f17efa1 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_update_shadow_word_inl.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_update_shadow_word.inc
@@ -1,4 +1,4 @@
-//===-- tsan_update_shadow_word_inl.h ---------------------------*- C++ -*-===//
+//===-- tsan_update_shadow_word.inc -----------------------------*- C++ -*-===//
 //
 // 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/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
index e1c72820f2be4..a9db1038e5f89 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
@@ -64,10 +64,10 @@ target(tsan_target_type, "tsan") {
     "rtl/tsan_interceptors_posix.cpp",
     "rtl/tsan_interface.cpp",
     "rtl/tsan_interface.h",
+    "rtl/tsan_interface.inc",
     "rtl/tsan_interface_ann.cpp",
     "rtl/tsan_interface_ann.h",
     "rtl/tsan_interface_atomic.cpp",
-    "rtl/tsan_interface_inl.h",
     "rtl/tsan_interface_java.cpp",
     "rtl/tsan_interface_java.h",
     "rtl/tsan_malloc_mac.cpp",
@@ -96,7 +96,7 @@ target(tsan_target_type, "tsan") {
     "rtl/tsan_sync.cpp",
     "rtl/tsan_sync.h",
     "rtl/tsan_trace.h",
-    "rtl/tsan_update_shadow_word_inl.h",
+    "rtl/tsan_update_shadow_word.inc",
     "rtl/tsan_vector_clock.cpp",
     "rtl/tsan_vector_clock.h",
   ]