[llvm] 425b908 - [ORC] Rename SPSTargetAddress to SPSExecutorAddress.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 1 19:42:35 PDT 2021
Author: Lang Hames
Date: 2021-07-02T12:40:14+10:00
New Revision: 425b908301e48ee6f372150bbc17f04cf199beb7
URL: https://github.com/llvm/llvm-project/commit/425b908301e48ee6f372150bbc17f04cf199beb7
DIFF: https://github.com/llvm/llvm-project/commit/425b908301e48ee6f372150bbc17f04cf199beb7.diff
LOG: [ORC] Rename SPSTargetAddress to SPSExecutorAddress.
Also removes SPSTagTargetAddress, which was accidentally introduced at some
point (and never used).
Added:
Modified:
llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp
llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h b/llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
index dc42c74a61204..db5c18b4b4911 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
@@ -43,7 +43,7 @@ class EPCDebugObjectRegistrar : public DebugObjectRegistrar {
: EPC(EPC), RegisterFn(RegisterFn) {}
Error registerDebugObject(sys::MemoryBlock TargetMem) override {
- return WrapperFunction<void(SPSTargetAddress, uint64_t)>::call(
+ return WrapperFunction<void(SPSExecutorAddress, uint64_t)>::call(
EPCCaller(EPC, RegisterFn), pointerToJITTargetAddress(TargetMem.base()),
static_cast<uint64_t>(TargetMem.allocatedSize()));
}
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
index e834675b4b414..a2ad84647d266 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
@@ -173,15 +173,6 @@ class SPSSerializationTraits<
// Any empty placeholder suitable as a substitute for void when deserializing
class SPSEmpty {};
-/// SPS tag type for target addresses.
-///
-/// SPSTagTargetAddresses should be serialized as a uint64_t value.
-class SPSTagTargetAddress;
-
-template <>
-class SPSSerializationTraits<SPSTagTargetAddress, uint64_t>
- : public SPSSerializationTraits<uint64_t, uint64_t> {};
-
/// SPS tag type for tuples.
///
/// A blob tuple should be serialized by serializing each of the elements in
@@ -201,11 +192,11 @@ template <typename SPSElementTagT> class SPSSequence;
/// SPS tag type for strings, which are equivalent to sequences of chars.
using SPSString = SPSSequence<char>;
-/// SPS tag type for target addresseses.
-class SPSTargetAddress {};
+/// SPS tag type for executor addresseses.
+class SPSExecutorAddress {};
template <>
-class SPSSerializationTraits<SPSTargetAddress, uint64_t>
+class SPSSerializationTraits<SPSExecutorAddress, uint64_t>
: public SPSSerializationTraits<uint64_t, uint64_t> {};
/// SPS tag type for maps.
diff --git a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp
index c51a68c1bfed6..4bfcf132c8f7e 100644
--- a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp
@@ -55,14 +55,14 @@ EPCEHFrameRegistrar::Create(ExecutorProcessControl &EPC) {
Error EPCEHFrameRegistrar::registerEHFrames(JITTargetAddress EHFrameSectionAddr,
size_t EHFrameSectionSize) {
- return WrapperFunction<void(SPSTargetAddress, uint64_t)>::call(
+ return WrapperFunction<void(SPSExecutorAddress, uint64_t)>::call(
EPCCaller(EPC, RegisterEHFrameWrapperFnAddr), EHFrameSectionAddr,
static_cast<uint64_t>(EHFrameSectionSize));
}
Error EPCEHFrameRegistrar::deregisterEHFrames(
JITTargetAddress EHFrameSectionAddr, size_t EHFrameSectionSize) {
- return WrapperFunction<void(SPSTargetAddress, uint64_t)>::call(
+ return WrapperFunction<void(SPSExecutorAddress, uint64_t)>::call(
EPCCaller(EPC, DeregisterEHFrameWrapperFnAddr), EHFrameSectionAddr,
static_cast<uint64_t>(EHFrameSectionSize));
}
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
index 55b1220a03534..43c2a44835fdf 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
@@ -95,7 +95,7 @@ static void registerJITLoaderGDBImpl(JITTargetAddress Addr, uint64_t Size) {
extern "C" orc::shared::detail::CWrapperFunctionResult
llvm_orc_registerJITLoaderGDBWrapper(const char *Data, uint64_t Size) {
using namespace orc::shared;
- return WrapperFunction<void(SPSTargetAddress, uint64_t)>::handle(
+ return WrapperFunction<void(SPSExecutorAddress, uint64_t)>::handle(
Data, Size, registerJITLoaderGDBImpl)
.release();
}
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
index 9463a36668cbd..4a408d61ee38b 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
@@ -167,14 +167,14 @@ static Error deregisterEHFrameWrapper(JITTargetAddress Addr, uint64_t Size) {
extern "C" orc::shared::detail::CWrapperFunctionResult
llvm_orc_registerEHFrameSectionWrapper(const char *Data, uint64_t Size) {
- return WrapperFunction<SPSError(SPSTargetAddress, uint64_t)>::handle(
+ return WrapperFunction<SPSError(SPSExecutorAddress, uint64_t)>::handle(
Data, Size, registerEHFrameWrapper)
.release();
}
extern "C" orc::shared::detail::CWrapperFunctionResult
llvm_orc_deregisterEHFrameSectionWrapper(const char *Data, uint64_t Size) {
- return WrapperFunction<SPSError(SPSTargetAddress, uint64_t)>::handle(
+ return WrapperFunction<SPSError(SPSExecutorAddress, uint64_t)>::handle(
Data, Size, deregisterEHFrameWrapper)
.release();
}
More information about the llvm-commits
mailing list