Hide header files that are not part of the interface.

Header files that are only used in the implementation files can become local to the library. This would simplify the installation.
compiler-research · Oct 30, 2023 · e8709ac · e8709ac
1 parent 6069bb1
commit e8709ac
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/include/clang/Interpreter/Compatibility.h → lib/Interpreter/Compatibility.h b/include/clang/Interpreter/Compatibility.h → lib/Interpreter/Compatibility.h
@@ -46,7 +46,7 @@ namespace compat {
 
     // sizeof (m_Opts) + sizeof(m_LLVMContext)
     const unsigned m_ExecutorOffset = 72;
-    int* IncrementalExecutor = ((int*)(&I)) + m_ExecutorOffset;
+    int* IncrementalExecutor = ((int*)(const_cast<cling::Interpreter*>(&I))) + m_ExecutorOffset;
     int* IncrementalJit = *(int**)IncrementalExecutor + 0;
     int* LLJIT = *(int**)IncrementalJit + 0;
     return *(llvm::orc::LLJIT**)LLJIT;
@@ -71,7 +71,7 @@ namespace compat {
 
 #include "clang/AST/Mangle.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/Interpreter/DynamicLibraryManager.h"
+#include "DynamicLibraryManager.h"
 #include "clang/Interpreter/Interpreter.h"
 #include "clang/Interpreter/Value.h"
 
@@ -230,7 +230,7 @@ createClangInterpreter(std::vector<const char*>& args) {
 
 }
 
-#include "clang/Interpreter/CppInterOpInterpreter.h"
+#include "CppInterOpInterpreter.h"
 
 namespace Cpp {
   namespace Cpp_utils = Cpp::utils;

diff --git a/lib/Interpreter/CppInterOp.cpp b/lib/Interpreter/CppInterOp.cpp
@@ -7,9 +7,10 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-#include "clang/Interpreter/Compatibility.h"
 #include "clang/Interpreter/CppInterOp.h"
 
+#include "Compatibility.h"
+
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"

diff --git a/...clang/Interpreter/CppInterOpInterpreter.h → lib/Interpreter/CppInterOpInterpreter.h b/...clang/Interpreter/CppInterOpInterpreter.h → lib/Interpreter/CppInterOpInterpreter.h
@@ -6,11 +6,12 @@
 #ifndef CPPINTEROP_INTERPRETER_H
 #define CPPINTEROP_INTERPRETER_H
 
-#include "clang/Interpreter/Compatibility.h"
-#include "clang/Interpreter/DynamicLibraryManager.h"
+#include "Compatibility.h"
+#include "DynamicLibraryManager.h"
+#include "Paths.h"
+
 #include "clang/Interpreter/Interpreter.h"
 #include "clang/Interpreter/PartialTranslationUnit.h"
-#include "clang/Interpreter/Paths.h"
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclarationName.h"

diff --git a/lib/Interpreter/DynamicLibraryManager.cpp b/lib/Interpreter/DynamicLibraryManager.cpp
@@ -7,8 +7,8 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-#include "clang/Interpreter/DynamicLibraryManager.h"
-#include "clang/Interpreter/Paths.h"
+#include "DynamicLibraryManager.h"
+#include "Paths.h"
 
 #include "llvm/ADT/StringSet.h"
 #include "llvm/BinaryFormat/Magic.h"

diff --git a/...clang/Interpreter/DynamicLibraryManager.h → lib/Interpreter/DynamicLibraryManager.h b/...clang/Interpreter/DynamicLibraryManager.h → lib/Interpreter/DynamicLibraryManager.h
diff --git a/lib/Interpreter/DynamicLibraryManagerSymbol.cpp b/lib/Interpreter/DynamicLibraryManagerSymbol.cpp
@@ -8,8 +8,8 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-#include "clang/Interpreter/DynamicLibraryManager.h"
-#include "clang/Interpreter/Paths.h"
+#include "DynamicLibraryManager.h"
+#include "Paths.h"
 
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/SmallString.h"

diff --git a/lib/Interpreter/Paths.cpp b/lib/Interpreter/Paths.cpp
@@ -7,8 +7,9 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
+#include "Paths.h"
+
 #include "clang/Basic/FileManager.h"
-#include "clang/Interpreter/Paths.h"
 #include "clang/Lex/HeaderSearchOptions.h"
 
 #include "llvm/Support/Debug.h"

diff --git a/include/clang/Interpreter/Paths.h → lib/Interpreter/Paths.h b/include/clang/Interpreter/Paths.h → lib/Interpreter/Paths.h
diff --git a/unittests/CppInterOp/Utils.h b/unittests/CppInterOp/Utils.h
@@ -1,7 +1,7 @@
 #ifndef CPPINTEROP_UNITTESTS_LIBCPPINTEROP_UTILS_H
 #define CPPINTEROP_UNITTESTS_LIBCPPINTEROP_UTILS_H
 
-#include "clang/Interpreter/Compatibility.h"
+#include "../../../lib/Interpreter/Compatibility.h"
 
 #include <memory>
 #include <vector>