From: Lang Hames <lhames@gmail.com>
Date: Mon, 22 Apr 2019 03:03:09 +0000 (+0000)
Subject: [JITLink] Remove a lot of reduntant 'JITLink_' prefixes. NFC.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ea61174c397ed17ab9ca3122a2deaaa153f0319;p=llvm

[JITLink] Remove a lot of reduntant 'JITLink_' prefixes. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358869 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ExecutionEngine/JITLink/JITLink_EHFrameSupport.h b/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
similarity index 85%
rename from include/llvm/ExecutionEngine/JITLink/JITLink_EHFrameSupport.h
rename to include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
index 3bcfc22a5c0..5c1c276d372 100644
--- a/include/llvm/ExecutionEngine/JITLink/JITLink_EHFrameSupport.h
+++ b/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
@@ -1,4 +1,4 @@
-//===----- JITLink_EHFrameSupport.h - JITLink eh-frame utils ----*- C++ -*-===//
+//===--------- EHFrameSupport.h - JITLink eh-frame utils --------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORT_H
-#define LLVM_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORT_H
+#ifndef LLVM_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORT_H
+#define LLVM_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORT_H
 
 #include "llvm/ADT/Triple.h"
 #include "llvm/ExecutionEngine/JITLink/JITLink.h"
@@ -39,4 +39,4 @@ AtomGraphPassFunction createEHFrameRecorderPass(const Triple &TT,
 } // end namespace jitlink
 } // end namespace llvm
 
-#endif // LLVM_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORT_H
+#endif // LLVM_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORT_H
diff --git a/include/llvm/ExecutionEngine/JITLink/JITLink_MachO.h b/include/llvm/ExecutionEngine/JITLink/MachO.h
similarity index 77%
rename from include/llvm/ExecutionEngine/JITLink/JITLink_MachO.h
rename to include/llvm/ExecutionEngine/JITLink/MachO.h
index bc02ce426c6..7facb657a51 100644
--- a/include/llvm/ExecutionEngine/JITLink/JITLink_MachO.h
+++ b/include/llvm/ExecutionEngine/JITLink/MachO.h
@@ -1,4 +1,4 @@
-//===--- JITLink_MachO.h - Generic JIT link function for MachO --*- C++ -*-===//
+//===------- MachO.h - Generic JIT link function for MachO ------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_H
-#define LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_H
+#ifndef LLVM_EXECUTIONENGINE_JITLINK_MACHO_H
+#define LLVM_EXECUTIONENGINE_JITLINK_MACHO_H
 
 #include "llvm/ExecutionEngine/JITLink/JITLink.h"
 
@@ -27,4 +27,4 @@ void jitLink_MachO(std::unique_ptr<JITLinkContext> Ctx);
 } // end namespace jitlink
 } // end namespace llvm
 
-#endif // LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_X86_64_H
+#endif // LLVM_EXECUTIONENGINE_JITLINK_MACHO_H
diff --git a/include/llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h b/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
similarity index 87%
rename from include/llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h
rename to include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
index 76ee07765d0..1d5b586afc3 100644
--- a/include/llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h
+++ b/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
@@ -1,4 +1,4 @@
-//===--- JITLink_MachO_x86_64.h - JIT link functions for MachO --*- C++ -*-===//
+//===--- MachO_x86_64.h - JIT link functions for MachO/x86-64 ---*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_X86_64_H
-#define LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_X86_64_H
+#ifndef LLVM_EXECUTIONENGINE_JITLINK_MACHO_X86_64_H
+#define LLVM_EXECUTIONENGINE_JITLINK_MACHO_X86_64_H
 
 #include "llvm/ExecutionEngine/JITLink/JITLink.h"
 
@@ -60,4 +60,4 @@ StringRef getMachOX86RelocationKindName(Edge::Kind R);
 } // end namespace jitlink
 } // end namespace llvm
 
-#endif // LLVM_EXECUTIONENGINE_JITLINK_JITLINK_MACHO_X86_64_H
+#endif // LLVM_EXECUTIONENGINE_JITLINK_MACHO_X86_64_H
diff --git a/lib/ExecutionEngine/JITLink/CMakeLists.txt b/lib/ExecutionEngine/JITLink/CMakeLists.txt
index 2a4196535cf..00fe8b07122 100644
--- a/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_llvm_library(LLVMJITLink
   JITLink.cpp
   JITLinkGeneric.cpp
-  JITLink_EHFrameSupport.cpp
-  JITLink_MachO.cpp
-  JITLink_MachO_x86_64.cpp
+  EHFrameSupport.cpp
+  MachO.cpp
+  MachO_x86_64.cpp
   MachOAtomGraphBuilder.cpp
 
   DEPENDS
diff --git a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp b/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
similarity index 99%
rename from lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp
rename to lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
index 38c537b5c78..6517b3b0d0c 100644
--- a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp
+++ b/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "JITLink_EHFrameSupportImpl.h"
+#include "EHFrameSupportImpl.h"
 
 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/Support/DynamicLibrary.h"
diff --git a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h b/lib/ExecutionEngine/JITLink/EHFrameSupportImpl.h
similarity index 84%
rename from lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h
rename to lib/ExecutionEngine/JITLink/EHFrameSupportImpl.h
index fe4b182401a..78be89cfca9 100644
--- a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h
+++ b/lib/ExecutionEngine/JITLink/EHFrameSupportImpl.h
@@ -1,4 +1,4 @@
-//===----- JITLink_EHFrameSupport.h - JITLink eh-frame utils ----*- C++ -*-===//
+//===------- EHFrameSupportImpl.h - JITLink eh-frame utils ------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORTIMPL_H
-#define LLVM_LIB_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORTIMPL_H
+#ifndef LLVM_LIB_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORTIMPL_H
+#define LLVM_LIB_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORTIMPL_H
 
-#include "llvm/ExecutionEngine/JITLink/JITLink_EHFrameSupport.h"
+#include "llvm/ExecutionEngine/JITLink/EHFrameSupport.h"
 
 #include "llvm/ExecutionEngine/JITLink/JITLink.h"
 #include "llvm/Support/BinaryStreamReader.h"
@@ -62,4 +62,4 @@ Error addEHFrame(AtomGraph &G, Section &EHFrameSection,
 } // end namespace jitlink
 } // end namespace llvm
 
-#endif // LLVM_LIB_EXECUTIONENGINE_JITLINK_JITLINK_EHFRAMESUPPORTIMPL_H
+#endif // LLVM_LIB_EXECUTIONENGINE_JITLINK_EHFRAMESUPPORTIMPL_H
diff --git a/lib/ExecutionEngine/JITLink/JITLink.cpp b/lib/ExecutionEngine/JITLink/JITLink.cpp
index 38c786e2ea2..3169011f082 100644
--- a/lib/ExecutionEngine/JITLink/JITLink.cpp
+++ b/lib/ExecutionEngine/JITLink/JITLink.cpp
@@ -10,7 +10,7 @@
 #include "llvm/ExecutionEngine/JITLink/JITLink.h"
 
 #include "llvm/BinaryFormat/Magic.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink_MachO.h"
+#include "llvm/ExecutionEngine/JITLink/MachO.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp b/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
index f6a31dc0515..04a4be1658c 100644
--- a/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
+++ b/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "JITLinkGeneric.h"
-#include "JITLink_EHFrameSupportImpl.h"
+#include "EHFrameSupportImpl.h"
 
 #include "llvm/Support/BinaryStreamReader.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/lib/ExecutionEngine/JITLink/JITLink_MachO.cpp b/lib/ExecutionEngine/JITLink/MachO.cpp
similarity index 87%
rename from lib/ExecutionEngine/JITLink/JITLink_MachO.cpp
rename to lib/ExecutionEngine/JITLink/MachO.cpp
index 7f4364d0b34..8755eeccebb 100644
--- a/lib/ExecutionEngine/JITLink/JITLink_MachO.cpp
+++ b/lib/ExecutionEngine/JITLink/MachO.cpp
@@ -1,4 +1,4 @@
-//===------------ JITLink.cpp - Run-time JIT linker for MachO -------------===//
+//===-------------- MachO.cpp - JIT linker function for MachO -------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -6,11 +6,15 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// MachO jit-link function.
+//
+//===----------------------------------------------------------------------===//
 
-#include "llvm/ExecutionEngine/JITLink/JITLink_MachO.h"
+#include "llvm/ExecutionEngine/JITLink/MachO.h"
 
 #include "llvm/BinaryFormat/MachO.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h"
+#include "llvm/ExecutionEngine/JITLink/MachO_x86_64.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp b/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
similarity index 99%
rename from lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp
rename to lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
index 9db129d13eb..3f12bf4b89f 100644
--- a/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp
+++ b/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
@@ -1,4 +1,4 @@
-//===------- JITLink_MachO_x86_64.cpp - JIT linker functionality ----------===//
+//===---- MachO_x86_64.cpp -JIT linker implementation for MachO/x86-64 ----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// MachO jit-link implementation.
+// MachO/x86-64 jit-link implementation.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h"
+#include "llvm/ExecutionEngine/JITLink/MachO_x86_64.h"
 
 #include "BasicGOTAndStubsBuilder.h"
 #include "MachOAtomGraphBuilder.h"
diff --git a/lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp b/lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp
index 7b85f654bde..154d7040b76 100644
--- a/lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp
+++ b/lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp
@@ -9,7 +9,7 @@
 #include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
 
 #include "llvm/ADT/Optional.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink_EHFrameSupport.h"
+#include "llvm/ExecutionEngine/JITLink/EHFrameSupport.h"
 
 #include <vector>
 
diff --git a/unittests/ExecutionEngine/JITLink/CMakeLists.txt b/unittests/ExecutionEngine/JITLink/CMakeLists.txt
index cad624d3017..9f9ffbbde1a 100644
--- a/unittests/ExecutionEngine/JITLink/CMakeLists.txt
+++ b/unittests/ExecutionEngine/JITLink/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_unittest(JITLinkTests
     JITLinkTestCommon.cpp
-    JITLinkTest_MachO_x86_64_Tests.cpp
+    MachO_x86_64_Tests.cpp
   )
 
 target_link_libraries(JITLinkTests PRIVATE LLVMTestingSupport)
diff --git a/unittests/ExecutionEngine/JITLink/JITLinkTest_MachO_x86_64_Tests.cpp b/unittests/ExecutionEngine/JITLink/MachO_x86_64_Tests.cpp
similarity index 98%
rename from unittests/ExecutionEngine/JITLink/JITLinkTest_MachO_x86_64_Tests.cpp
rename to unittests/ExecutionEngine/JITLink/MachO_x86_64_Tests.cpp
index 36e62a4f0ca..98c5d44d466 100644
--- a/unittests/ExecutionEngine/JITLink/JITLinkTest_MachO_x86_64_Tests.cpp
+++ b/unittests/ExecutionEngine/JITLink/MachO_x86_64_Tests.cpp
@@ -1,4 +1,4 @@
-//===---- JITLinkTest_MachO_x86_64.cpp - Tests for JITLink MachO/x86-64 ---===//
+//===--------- MachO_x86_64.cpp - Tests for JITLink MachO/x86-64 ----------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 #include "JITLinkTestCommon.h"
 
 #include "llvm/ADT/DenseSet.h"
-#include "llvm/ExecutionEngine/JITLink/JITLink_MachO_x86_64.h"
+#include "llvm/ExecutionEngine/JITLink/MachO_x86_64.h"
 #include "llvm/Testing/Support/Error.h"
 
 #include "gtest/gtest.h"