From 767b328e506ef069ecbb89b7cc9e2da7f8f84c6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20Gr=C3=A4nitz?= Date: Thu, 23 Sep 2021 19:00:48 +0200 Subject: [PATCH] [ORC] Minor renaming and typo fixes (NFC) Two typos, one unsused include and some leftovers from the TargetProcessControl -> ExecutorProcessControl renaming Reviewed By: xgupta Differential Revision: https://reviews.llvm.org/D110260 --- clang/docs/ClangFormattedStatus.rst | 2 +- llvm/examples/OrcV2Examples/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 ++-- .../LLJITWithExecutorProcessControl.cpp} | 0 llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h | 2 +- llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h | 1 - llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) rename llvm/examples/OrcV2Examples/{LLJITWithTargetProcessControl => LLJITWithExecutorProcessControl}/CMakeLists.txt (54%) rename llvm/examples/OrcV2Examples/{LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp => LLJITWithExecutorProcessControl/LLJITWithExecutorProcessControl.cpp} (100%) diff --git a/clang/docs/ClangFormattedStatus.rst b/clang/docs/ClangFormattedStatus.rst index beca555..8f6cd5e 100644 --- a/clang/docs/ClangFormattedStatus.rst +++ b/clang/docs/ClangFormattedStatus.rst @@ -3704,7 +3704,7 @@ tree in terms of conformance to :doc:`ClangFormat` as of: June 04, 2021 13:01:37 - `3` - `0` - :good:`100%` - * - llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl + * - llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl - `1` - `1` - `0` diff --git a/llvm/examples/OrcV2Examples/CMakeLists.txt b/llvm/examples/OrcV2Examples/CMakeLists.txt index d6fa742..736ceff6 100644 --- a/llvm/examples/OrcV2Examples/CMakeLists.txt +++ b/llvm/examples/OrcV2Examples/CMakeLists.txt @@ -1,12 +1,12 @@ add_subdirectory(LLJITDumpObjects) add_subdirectory(LLJITWithCustomObjectLinkingLayer) +add_subdirectory(LLJITWithExecutorProcessControl) add_subdirectory(LLJITWithGDBRegistrationListener) add_subdirectory(LLJITWithInitializers) add_subdirectory(LLJITWithLazyReexports) add_subdirectory(LLJITWithObjectCache) add_subdirectory(LLJITWithObjectLinkingLayerPlugin) add_subdirectory(LLJITWithOptimizingIRTransform) -add_subdirectory(LLJITWithTargetProcessControl) add_subdirectory(LLJITWithThinLTOSummaries) add_subdirectory(OrcV2CBindingsAddObjectFile) add_subdirectory(OrcV2CBindingsBasicUsage) diff --git a/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt b/llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl/CMakeLists.txt similarity index 54% rename from llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt rename to llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl/CMakeLists.txt index 10e0de8..47f50ca 100644 --- a/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/CMakeLists.txt +++ b/llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl/CMakeLists.txt @@ -7,6 +7,6 @@ set(LLVM_LINK_COMPONENTS nativecodegen ) -add_llvm_example(LLJITWithTargetProcessControl - LLJITWithTargetProcessControl.cpp +add_llvm_example(LLJITWithExecutorProcessControl + LLJITWithExecutorProcessControl.cpp ) diff --git a/llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp b/llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl/LLJITWithExecutorProcessControl.cpp similarity index 100% rename from llvm/examples/OrcV2Examples/LLJITWithTargetProcessControl/LLJITWithTargetProcessControl.cpp rename to llvm/examples/OrcV2Examples/LLJITWithExecutorProcessControl/LLJITWithExecutorProcessControl.cpp diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h index 78a6623..960dee6 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h @@ -47,7 +47,7 @@ public: } /// Cast this ExecutorAddress to a pointer of the given type. - /// Warning: This should only be esude when JITing in-process. + /// Warning: This should only be used when JITing in-process. template T toPtr() const { static_assert(std::is_pointer::value, "T must be a pointer type"); uintptr_t IntPtr = static_cast(Addr); diff --git a/llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h b/llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h index c87df29..29d43be 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h @@ -15,7 +15,6 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/FunctionExtras.h" -#include "llvm/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManager.h" #include "llvm/ExecutionEngine/Orc/EPCGenericMemoryAccess.h" #include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h" #include "llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h" diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp index 247c53f..d72bd72 100644 --- a/llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.cpp @@ -223,7 +223,7 @@ void FDSimpleRemoteEPCTransport::listenLoop() { if (MsgSize < FDMsgHeader::Size) { Err = joinErrors(std::move(Err), - make_error("Mesasge size too small", + make_error("Message size too small", inconvertibleErrorCode())); break; } -- 2.7.4