[llvm] [orc-rt] Add include/orc-rt-internal for internal APIs. (PR #219386)
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 27 23:39:40 PDT 2026
https://github.com/lhames created https://github.com/llvm/llvm-project/pull/219386
Headers here are not installed. A prefix directory rather than a separate include root, so that internality is visible at each #include site.
Moved in: support/{Endian,StringExtras}.h; orc-rt-utils/CommandLine.h becomes orc-rt-internal/tools/CommandLine.h, retiring orc-rt-utils/ as a third include root; and lib/bedrock/{Environment,GDBJITRegistrar, TargetDetails}.h, so lib/ now holds only translation units and the two Unix/*.inc fragments. That also removes the last "../" include, and orc-rt-bedrock-impl-headers, which existed only to expose lib/ for cross-directory includes.
>From f2465c0f95f2c4d08c0892e09a9fc014f91ed79c Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Fri, 28 Aug 2026 15:21:48 +1000
Subject: [PATCH] [orc-rt] Add include/orc-rt-internal for internal APIs.
Headers here are not installed. A prefix directory rather than a
separate include root, so that internality is visible at each #include
site.
Moved in: support/{Endian,StringExtras}.h; orc-rt-utils/CommandLine.h
becomes orc-rt-internal/tools/CommandLine.h, retiring orc-rt-utils/ as a
third include root; and lib/bedrock/{Environment,GDBJITRegistrar,
TargetDetails}.h, so lib/ now holds only translation units and the two
Unix/*.inc fragments. That also removes the last "../" include, and
orc-rt-bedrock-impl-headers, which existed only to expose lib/ for
cross-directory includes.
---
orc-rt/include/CMakeLists.txt | 8 +++++---
.../orc-rt-internal}/bedrock/Environment.h | 6 +++---
.../orc-rt-internal}/bedrock/GDBJITRegistrar.h | 12 ++++--------
.../orc-rt-internal}/bedrock/TargetDetails.h | 6 +++---
.../{orc-rt => orc-rt-internal}/support/Endian.h | 6 +++---
.../support/StringExtras.h | 4 ++--
.../tools}/CommandLine.h | 8 ++++----
orc-rt/lib/bedrock/CMakeLists.txt | 7 -------
orc-rt/lib/bedrock/Environment.cpp | 2 +-
orc-rt/lib/bedrock/ExecutorProcessInfo.cpp | 2 +-
orc-rt/lib/bedrock/GDBJITRegistrar.cpp | 2 +-
orc-rt/lib/bedrock/Logging_printf.cpp | 2 +-
orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp | 2 +-
orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc | 2 +-
orc-rt/lib/bedrock/darwin/CPUFeatures.cpp | 2 +-
orc-rt/lib/bedrock/darwin/TargetTriple.cpp | 2 +-
orc-rt/lib/bedrock/sps/GDBJITRegistrarSPSCI.cpp | 2 +-
orc-rt/test/tools/orc-rt-log-check.cpp | 2 +-
orc-rt/test/tools/orc-rt-process-info-check.cpp | 2 +-
orc-rt/test/unit/CMakeLists.txt | 1 -
orc-rt/test/unit/bedrock/ExecutorProcessInfoTest.cpp | 2 +-
orc-rt/test/unit/support/EndianTest.cpp | 2 +-
orc-rt/test/unit/support/StringExtrasTest.cpp | 2 +-
orc-rt/test/unit/utils/CommandLineTest.cpp | 2 +-
24 files changed, 39 insertions(+), 49 deletions(-)
rename orc-rt/{lib => include/orc-rt-internal}/bedrock/Environment.h (87%)
rename orc-rt/{lib => include/orc-rt-internal}/bedrock/GDBJITRegistrar.h (77%)
rename orc-rt/{lib => include/orc-rt-internal}/bedrock/TargetDetails.h (92%)
rename orc-rt/include/{orc-rt => orc-rt-internal}/support/Endian.h (90%)
rename orc-rt/include/{orc-rt => orc-rt-internal}/support/StringExtras.h (98%)
rename orc-rt/include/{orc-rt-utils => orc-rt-internal/tools}/CommandLine.h (97%)
diff --git a/orc-rt/include/CMakeLists.txt b/orc-rt/include/CMakeLists.txt
index 7cc9b8b3faf88..8cbce12d9c2f3 100644
--- a/orc-rt/include/CMakeLists.txt
+++ b/orc-rt/include/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Headers installed with the runtime.
+#
+# Headers under orc-rt-internal/ are deliberately not listed: they are not
+# installed. Don't add them here to "complete" the list. An installed header
+# must not include an internal one, or the installed tree won't compile.
set(ORC_RT_HEADERS
orc-rt-c/bedrock/Session.h
orc-rt-c/support/Compiler.h
@@ -5,7 +10,6 @@ set(ORC_RT_HEADERS
orc-rt-c/support/Error.h
orc-rt-c/support/Logging.h
orc-rt-c/support/WrapperFunction.h
- orc-rt-utils/CommandLine.h
orc-rt/bedrock/BootstrapInfo.h
orc-rt/bedrock/ExecutorProcessInfo.h
orc-rt/bedrock/InProcessControllerAccess.h
@@ -31,7 +35,6 @@ set(ORC_RT_HEADERS
orc-rt/support/CCallback.h
orc-rt/support/CallableTraitsHelper.h
orc-rt/support/Compiler.h
- orc-rt/support/Endian.h
orc-rt/support/Error.h
orc-rt/support/ExecutorAddress.h
orc-rt/support/IntervalMap.h
@@ -47,7 +50,6 @@ set(ORC_RT_HEADERS
orc-rt/support/SPSWrapperFunction.h
orc-rt/support/SPSWrapperFunctionBuffer.h
orc-rt/support/SimplePackedSerialization.h
- orc-rt/support/StringExtras.h
orc-rt/support/StringPool.h
orc-rt/support/WrapperFunction.h
orc-rt/support/bind.h
diff --git a/orc-rt/lib/bedrock/Environment.h b/orc-rt/include/orc-rt-internal/bedrock/Environment.h
similarity index 87%
rename from orc-rt/lib/bedrock/Environment.h
rename to orc-rt/include/orc-rt-internal/bedrock/Environment.h
index cb2d8ca00120a..f254a635a305e 100644
--- a/orc-rt/lib/bedrock/Environment.h
+++ b/orc-rt/include/orc-rt-internal/bedrock/Environment.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef ORC_RT_LIB_EXECUTOR_ENVIRONMENT_H
-#define ORC_RT_LIB_EXECUTOR_ENVIRONMENT_H
+#ifndef ORC_RT_INTERNAL_BEDROCK_ENVIRONMENT_H
+#define ORC_RT_INTERNAL_BEDROCK_ENVIRONMENT_H
namespace orc_rt {
@@ -25,4 +25,4 @@ const char *secureGetenv(const char *Name);
} // namespace orc_rt
-#endif // ORC_RT_LIB_EXECUTOR_ENVIRONMENT_H
+#endif // ORC_RT_INTERNAL_BEDROCK_ENVIRONMENT_H
diff --git a/orc-rt/lib/bedrock/GDBJITRegistrar.h b/orc-rt/include/orc-rt-internal/bedrock/GDBJITRegistrar.h
similarity index 77%
rename from orc-rt/lib/bedrock/GDBJITRegistrar.h
rename to orc-rt/include/orc-rt-internal/bedrock/GDBJITRegistrar.h
index fe92e44be52bd..fa7617c4fd5c6 100644
--- a/orc-rt/lib/bedrock/GDBJITRegistrar.h
+++ b/orc-rt/include/orc-rt-internal/bedrock/GDBJITRegistrar.h
@@ -10,16 +10,12 @@
// interface (also implemented by LLDB and other tools).
//
// These functions exist to implement the GDBJITRegistrar allocation actions in
-// the SPS controller interface (see sps-ci/GDBJITRegistrarSPSCI.cpp). They can
-// be called directly, but that isn't their purpose: this is a private
-// implementation header, not part of the public orc-rt API. If a direct client
-// ever appears, promote this header to include/orc-rt/ rather than reaching
-// into lib/.
+// the SPS controller interface (see sps/GDBJITRegistrarSPSCI.cpp).
//
//===----------------------------------------------------------------------===//
-#ifndef ORC_RT_GDBJITREGISTRAR_H
-#define ORC_RT_GDBJITREGISTRAR_H
+#ifndef ORC_RT_INTERNAL_BEDROCK_GDBJITREGISTRAR_H
+#define ORC_RT_INTERNAL_BEDROCK_GDBJITREGISTRAR_H
#include "orc-rt/support/Error.h"
#include "orc-rt/support/span.h"
@@ -43,4 +39,4 @@ Error deregisterObject(span<char> Obj);
} // namespace orc_rt::gdb_jit
-#endif // ORC_RT_GDBJITREGISTRAR_H
+#endif // ORC_RT_INTERNAL_BEDROCK_GDBJITREGISTRAR_H
diff --git a/orc-rt/lib/bedrock/TargetDetails.h b/orc-rt/include/orc-rt-internal/bedrock/TargetDetails.h
similarity index 92%
rename from orc-rt/lib/bedrock/TargetDetails.h
rename to orc-rt/include/orc-rt-internal/bedrock/TargetDetails.h
index 65b8ce16011ee..3caaf8111ca30 100644
--- a/orc-rt/lib/bedrock/TargetDetails.h
+++ b/orc-rt/include/orc-rt-internal/bedrock/TargetDetails.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef ORC_RT_TARGETDETAILS_H
-#define ORC_RT_TARGETDETAILS_H
+#ifndef ORC_RT_INTERNAL_BEDROCK_TARGETDETAILS_H
+#define ORC_RT_INTERNAL_BEDROCK_TARGETDETAILS_H
#include <string_view>
@@ -48,4 +48,4 @@ inline constexpr std::string_view sha3 = "sha3";
} // namespace orc_rt::target_detail
-#endif // ORC_RT_TARGETDETAILS_H
+#endif // ORC_RT_INTERNAL_BEDROCK_TARGETDETAILS_H
diff --git a/orc-rt/include/orc-rt/support/Endian.h b/orc-rt/include/orc-rt-internal/support/Endian.h
similarity index 90%
rename from orc-rt/include/orc-rt/support/Endian.h
rename to orc-rt/include/orc-rt-internal/support/Endian.h
index cbe9a69ae2f32..3c8bdac851ecb 100644
--- a/orc-rt/include/orc-rt/support/Endian.h
+++ b/orc-rt/include/orc-rt-internal/support/Endian.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef ORC_RT_SUPPORT_ENDIAN_H
-#define ORC_RT_SUPPORT_ENDIAN_H
+#ifndef ORC_RT_INTERNAL_SUPPORT_ENDIAN_H
+#define ORC_RT_INTERNAL_SUPPORT_ENDIAN_H
#include "orc-rt/support/bit.h"
#include <cstring>
@@ -41,4 +41,4 @@ endian_write(void *Dst, T Val, orc_rt::endian E) noexcept {
} // namespace orc_rt
-#endif // ORC_RT_SUPPORT_ENDIAN_H
+#endif // ORC_RT_INTERNAL_SUPPORT_ENDIAN_H
diff --git a/orc-rt/include/orc-rt/support/StringExtras.h b/orc-rt/include/orc-rt-internal/support/StringExtras.h
similarity index 98%
rename from orc-rt/include/orc-rt/support/StringExtras.h
rename to orc-rt/include/orc-rt-internal/support/StringExtras.h
index cadea80f26dcd..35995bdfd9ee6 100644
--- a/orc-rt/include/orc-rt/support/StringExtras.h
+++ b/orc-rt/include/orc-rt-internal/support/StringExtras.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef ORC_RT_SUPPORT_STRINGEXTRAS_H
-#define ORC_RT_SUPPORT_STRINGEXTRAS_H
+#ifndef ORC_RT_INTERNAL_SUPPORT_STRINGEXTRAS_H
+#define ORC_RT_INTERNAL_SUPPORT_STRINGEXTRAS_H
#include <cassert>
#include <charconv>
diff --git a/orc-rt/include/orc-rt-utils/CommandLine.h b/orc-rt/include/orc-rt-internal/tools/CommandLine.h
similarity index 97%
rename from orc-rt/include/orc-rt-utils/CommandLine.h
rename to orc-rt/include/orc-rt-internal/tools/CommandLine.h
index 62af01fccd1c6..57aaf2b858e59 100644
--- a/orc-rt/include/orc-rt-utils/CommandLine.h
+++ b/orc-rt/include/orc-rt-internal/tools/CommandLine.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef ORC_RT_UTILS_COMMANDLINE_H
-#define ORC_RT_UTILS_COMMANDLINE_H
+#ifndef ORC_RT_INTERNAL_TOOLS_COMMANDLINE_H
+#define ORC_RT_INTERNAL_TOOLS_COMMANDLINE_H
#include <algorithm>
#include <charconv>
@@ -22,8 +22,8 @@
#include <string_view>
#include <vector>
+#include "orc-rt-internal/support/StringExtras.h"
#include "orc-rt/support/Error.h"
-#include "orc-rt/support/StringExtras.h"
namespace orc_rt {
namespace detail {
@@ -261,4 +261,4 @@ class CommandLineParser {
} // namespace orc_rt
-#endif // ORC_RT_UTILS_COMMANDLINE_H
+#endif // ORC_RT_INTERNAL_TOOLS_COMMANDLINE_H
diff --git a/orc-rt/lib/bedrock/CMakeLists.txt b/orc-rt/lib/bedrock/CMakeLists.txt
index 54cb7ee39cf5f..77da2748e88db 100644
--- a/orc-rt/lib/bedrock/CMakeLists.txt
+++ b/orc-rt/lib/bedrock/CMakeLists.txt
@@ -65,13 +65,6 @@ add_library(orc-rt-bedrock STATIC ${ORC_RT_SOURCES})
target_link_libraries(orc-rt-bedrock PUBLIC orc-rt-headers)
-add_library(orc-rt-bedrock-impl-headers INTERFACE)
-# Add it via lib so that to include impl details its "bedrock/"
-# to prevent collisions down the line
-target_include_directories(orc-rt-bedrock-impl-headers INTERFACE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>
-)
-
# Apply RTTI and exceptions compile flags
target_compile_options(orc-rt-bedrock PRIVATE ${ORC_RT_COMPILE_FLAGS})
# TODO: Use common runtimes infrastructure for output and install paths
diff --git a/orc-rt/lib/bedrock/Environment.cpp b/orc-rt/lib/bedrock/Environment.cpp
index 28a240965d300..ce4e0b0678ab0 100644
--- a/orc-rt/lib/bedrock/Environment.cpp
+++ b/orc-rt/lib/bedrock/Environment.cpp
@@ -15,7 +15,7 @@
#define _GNU_SOURCE
#endif
-#include "Environment.h"
+#include "orc-rt-internal/bedrock/Environment.h"
#include <stdlib.h>
diff --git a/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp b/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
index 349890853664a..6f302e8961444 100644
--- a/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
+++ b/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "orc-rt-internal/support/StringExtras.h"
#include "orc-rt/support/Math.h"
-#include "orc-rt/support/StringExtras.h"
#include <cassert>
#include <cstring>
diff --git a/orc-rt/lib/bedrock/GDBJITRegistrar.cpp b/orc-rt/lib/bedrock/GDBJITRegistrar.cpp
index f48a146d7c0ee..586f557eab4e2 100644
--- a/orc-rt/lib/bedrock/GDBJITRegistrar.cpp
+++ b/orc-rt/lib/bedrock/GDBJITRegistrar.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "GDBJITRegistrar.h"
+#include "orc-rt-internal/bedrock/GDBJITRegistrar.h"
#include "orc-rt/support/Compiler.h"
#include <cstdint>
diff --git a/orc-rt/lib/bedrock/Logging_printf.cpp b/orc-rt/lib/bedrock/Logging_printf.cpp
index fa49d71132132..4d73c7a27e068 100644
--- a/orc-rt/lib/bedrock/Logging_printf.cpp
+++ b/orc-rt/lib/bedrock/Logging_printf.cpp
@@ -13,7 +13,7 @@
#include "orc-rt-c/support/Logging.h"
-#include "Environment.h"
+#include "orc-rt-internal/bedrock/Environment.h"
#include <algorithm>
#include <cstdarg>
diff --git a/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp b/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
index b942290e4025f..fcd2c5c4066f4 100644
--- a/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
+++ b/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "orc-rt/bedrock/SimpleNativeMemoryMap.h"
+#include "orc-rt-internal/support/StringExtras.h"
#include "orc-rt/bedrock/Session.h"
-#include "orc-rt/support/StringExtras.h"
#include <optional>
diff --git a/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc b/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
index 9ae2311c2579b..e1ef18ad694a8 100644
--- a/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
+++ b/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
+#include "orc-rt-internal/support/StringExtras.h"
#include "orc-rt/support/Error.h"
-#include "orc-rt/support/StringExtras.h"
#include <dlfcn.h>
diff --git a/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp b/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
index 20606da3fe0d2..3f75025e05f32 100644
--- a/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
+++ b/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt/bedrock/ExecutorProcessInfo.h"
-#include "../TargetDetails.h"
+#include "orc-rt-internal/bedrock/TargetDetails.h"
#include <cstdint>
#include <sys/sysctl.h>
diff --git a/orc-rt/lib/bedrock/darwin/TargetTriple.cpp b/orc-rt/lib/bedrock/darwin/TargetTriple.cpp
index e8233b9ead24e..b8eb0e63819fb 100644
--- a/orc-rt/lib/bedrock/darwin/TargetTriple.cpp
+++ b/orc-rt/lib/bedrock/darwin/TargetTriple.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "../TargetDetails.h"
+#include "orc-rt-internal/bedrock/TargetDetails.h"
#include "orc-rt/bedrock/ExecutorProcessInfo.h"
#include <TargetConditionals.h>
diff --git a/orc-rt/lib/bedrock/sps/GDBJITRegistrarSPSCI.cpp b/orc-rt/lib/bedrock/sps/GDBJITRegistrarSPSCI.cpp
index fefc173d26af1..79e521332bc6f 100644
--- a/orc-rt/lib/bedrock/sps/GDBJITRegistrarSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps/GDBJITRegistrarSPSCI.cpp
@@ -13,7 +13,7 @@
#include "orc-rt/bedrock/sps/GDBJITRegistrarSPSCI.h"
#include "orc-rt/support/SPSAllocAction.h"
-#include "../GDBJITRegistrar.h"
+#include "orc-rt-internal/bedrock/GDBJITRegistrar.h"
using namespace orc_rt;
diff --git a/orc-rt/test/tools/orc-rt-log-check.cpp b/orc-rt/test/tools/orc-rt-log-check.cpp
index 197788057d640..c288053d7183f 100644
--- a/orc-rt/test/tools/orc-rt-log-check.cpp
+++ b/orc-rt/test/tools/orc-rt-log-check.cpp
@@ -25,7 +25,7 @@
#include "orc-rt-c/support/Logging.h"
-#include "orc-rt-utils/CommandLine.h"
+#include "orc-rt-internal/tools/CommandLine.h"
#include <iostream>
diff --git a/orc-rt/test/tools/orc-rt-process-info-check.cpp b/orc-rt/test/tools/orc-rt-process-info-check.cpp
index 6e5f11df81138..e4d9e4d72071b 100644
--- a/orc-rt/test/tools/orc-rt-process-info-check.cpp
+++ b/orc-rt/test/tools/orc-rt-process-info-check.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt-utils/CommandLine.h"
+#include "orc-rt-internal/tools/CommandLine.h"
#include "orc-rt/bedrock/ExecutorProcessInfo.h"
#include <iostream>
diff --git a/orc-rt/test/unit/CMakeLists.txt b/orc-rt/test/unit/CMakeLists.txt
index da19d05553fb8..f58dac2d86e7f 100644
--- a/orc-rt/test/unit/CMakeLists.txt
+++ b/orc-rt/test/unit/CMakeLists.txt
@@ -75,7 +75,6 @@ target_compile_options(CoreTests PRIVATE ${ORC_RT_COMPILE_FLAGS})
target_include_directories(CoreTests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(CoreTests PRIVATE
orc-rt-bedrock
- orc-rt-bedrock-impl-headers
)
# Build a shared library for NativeDylibManager tests.
diff --git a/orc-rt/test/unit/bedrock/ExecutorProcessInfoTest.cpp b/orc-rt/test/unit/bedrock/ExecutorProcessInfoTest.cpp
index 04e8aa15e5d04..1b5adab0cc75e 100644
--- a/orc-rt/test/unit/bedrock/ExecutorProcessInfoTest.cpp
+++ b/orc-rt/test/unit/bedrock/ExecutorProcessInfoTest.cpp
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt/bedrock/ExecutorProcessInfo.h"
-#include "bedrock/TargetDetails.h"
+#include "orc-rt-internal/bedrock/TargetDetails.h"
#include "orc-rt/support/Math.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/support/EndianTest.cpp b/orc-rt/test/unit/support/EndianTest.cpp
index 46f1151ee56c4..e9ab678f06f38 100644
--- a/orc-rt/test/unit/support/EndianTest.cpp
+++ b/orc-rt/test/unit/support/EndianTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/support/Endian.h"
+#include "orc-rt-internal/support/Endian.h"
#include "orc-rt/support/bit.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/support/StringExtrasTest.cpp b/orc-rt/test/unit/support/StringExtrasTest.cpp
index 8a1af95d8b513..f5ec9832ecae2 100644
--- a/orc-rt/test/unit/support/StringExtrasTest.cpp
+++ b/orc-rt/test/unit/support/StringExtrasTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/support/StringExtras.h"
+#include "orc-rt-internal/support/StringExtras.h"
#include "gtest/gtest.h"
#include <cstdint>
diff --git a/orc-rt/test/unit/utils/CommandLineTest.cpp b/orc-rt/test/unit/utils/CommandLineTest.cpp
index cc75d1dd05397..36b5fbf3113f6 100644
--- a/orc-rt/test/unit/utils/CommandLineTest.cpp
+++ b/orc-rt/test/unit/utils/CommandLineTest.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt-utils/CommandLine.h"
+#include "orc-rt-internal/tools/CommandLine.h"
#include "orc-rt/support/Error.h"
#include "llvm/Testing/Support/Error.h"
#include "gtest/gtest.h"
More information about the llvm-commits
mailing list