[llvm] [ORC] Move ExecutorSharedMemoryMapperService names to sps_ci (PR #222835)
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 10 20:54:46 PDT 2026
https://github.com/lhames updated https://github.com/llvm/llvm-project/pull/222835
>From 6b6275f012b3cbf0bdc68d3f9178de565d442236 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Wed, 9 Sep 2026 22:53:30 +1000
Subject: [PATCH 1/2] [ORC] Move ExecutorSharedMemoryMapperService names to
sps_ci
Relocate the service's interface names and SPS signatures from rt:: in
OrcRTBridge into a new Shared/SPSCI/SharedMemoryMapperSPSCI.h, matching
the existing SPSCI descriptor convention. Name-neutral: the symbol
strings are unchanged.
---
.../ExecutionEngine/Orc/Shared/OrcRTBridge.h | 23 -------
.../Shared/SPSCI/SharedMemoryMapperSPSCI.h | 60 +++++++++++++++++++
llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp | 9 +--
.../Orc/Shared/OrcRTBridge.cpp | 11 ----
.../ExecutorSharedMemoryMapperService.cpp | 19 +++---
llvm/tools/llvm-jitlink/llvm-jitlink.cpp | 11 ++--
.../Orc/SharedMemoryMapperTest.cpp | 11 ++--
7 files changed, 87 insertions(+), 57 deletions(-)
create mode 100644 llvm/include/llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
index 749d92d77d583..0608313a1c5e8 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
@@ -28,14 +28,6 @@ LLVM_ABI extern const char *SimpleExecutorMemoryManagerInitializeWrapperName;
LLVM_ABI extern const char *SimpleExecutorMemoryManagerDeinitializeWrapperName;
LLVM_ABI extern const char *SimpleExecutorMemoryManagerReleaseWrapperName;
-LLVM_ABI extern const char *ExecutorSharedMemoryMapperServiceInstanceName;
-LLVM_ABI extern const char *ExecutorSharedMemoryMapperServiceReserveWrapperName;
-LLVM_ABI extern const char
- *ExecutorSharedMemoryMapperServiceInitializeWrapperName;
-LLVM_ABI extern const char
- *ExecutorSharedMemoryMapperServiceDeinitializeWrapperName;
-LLVM_ABI extern const char *ExecutorSharedMemoryMapperServiceReleaseWrapperName;
-
LLVM_ABI extern const char *RegisterEHFrameSectionAllocActionName;
LLVM_ABI extern const char *DeregisterEHFrameSectionAllocActionName;
@@ -68,21 +60,6 @@ using SPSSimpleExecutorMemoryManagerDeinitializeSignature = shared::SPSError(
using SPSSimpleExecutorMemoryManagerReleaseSignature = shared::SPSError(
shared::SPSExecutorAddr, shared::SPSSequence<shared::SPSExecutorAddr>);
-// ExecutorSharedMemoryMapperService
-using SPSExecutorSharedMemoryMapperServiceReserveSignature =
- shared::SPSExpected<
- shared::SPSTuple<shared::SPSExecutorAddr, shared::SPSString>>(
- shared::SPSExecutorAddr, uint64_t);
-using SPSExecutorSharedMemoryMapperServiceInitializeSignature =
- shared::SPSExpected<shared::SPSExecutorAddr>(
- shared::SPSExecutorAddr, shared::SPSExecutorAddr,
- shared::SPSSharedMemoryFinalizeRequest);
-using SPSExecutorSharedMemoryMapperServiceDeinitializeSignature =
- shared::SPSError(shared::SPSExecutorAddr,
- shared::SPSSequence<shared::SPSExecutorAddr>);
-using SPSExecutorSharedMemoryMapperServiceReleaseSignature = shared::SPSError(
- shared::SPSExecutorAddr, shared::SPSSequence<shared::SPSExecutorAddr>);
-
} // end namespace rt
namespace rt_alt {
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h
new file mode 100644
index 0000000000000..9e7e30dc18390
--- /dev/null
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h
@@ -0,0 +1,60 @@
+//===- SharedMemoryMapperSPSCI.h - SPS CI for shared-mem mapping *- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// SPS controller-interface descriptors for the executor's shared-memory mapper
+// service. See CallSPSCI.h for a description of the descriptor scheme.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_EXECUTIONENGINE_ORC_SHARED_SPSCI_SHAREDMEMORYMAPPERSPSCI_H
+#define LLVM_EXECUTIONENGINE_ORC_SHARED_SPSCI_SHAREDMEMORYMAPPERSPSCI_H
+
+#include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
+#include "llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h"
+#include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
+
+#include <cstdint>
+
+namespace llvm::orc::rt::sps_ci {
+
+inline constexpr char SharedMemoryMapperInstanceName[] =
+ "__llvm_orc_ExecutorSharedMemoryMapperService_Instance";
+
+struct SharedMemoryMapperReserve {
+ static constexpr char Name[] =
+ "__llvm_orc_ExecutorSharedMemoryMapperService_Reserve";
+ using SPSSig = shared::SPSExpected<
+ shared::SPSTuple<shared::SPSExecutorAddr, shared::SPSString>>(
+ shared::SPSExecutorAddr, uint64_t);
+};
+
+struct SharedMemoryMapperInitialize {
+ static constexpr char Name[] =
+ "__llvm_orc_ExecutorSharedMemoryMapperService_Initialize";
+ using SPSSig = shared::SPSExpected<shared::SPSExecutorAddr>(
+ shared::SPSExecutorAddr, shared::SPSExecutorAddr,
+ shared::SPSSharedMemoryFinalizeRequest);
+};
+
+struct SharedMemoryMapperDeinitialize {
+ static constexpr char Name[] =
+ "__llvm_orc_ExecutorSharedMemoryMapperService_Deinitialize";
+ using SPSSig = shared::SPSError(shared::SPSExecutorAddr,
+ shared::SPSSequence<shared::SPSExecutorAddr>);
+};
+
+struct SharedMemoryMapperRelease {
+ static constexpr char Name[] =
+ "__llvm_orc_ExecutorSharedMemoryMapperService_Release";
+ using SPSSig = shared::SPSError(shared::SPSExecutorAddr,
+ shared::SPSSequence<shared::SPSExecutorAddr>);
+};
+
+} // namespace llvm::orc::rt::sps_ci
+
+#endif // LLVM_EXECUTIONENGINE_ORC_SHARED_SPSCI_SHAREDMEMORYMAPPERSPSCI_H
diff --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
index 77768886f72a8..77d6fed83db75 100644
--- a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
@@ -10,6 +10,7 @@
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
+#include "llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h"
#include "llvm/Support/MSVCErrorWorkarounds.h"
#include "llvm/Support/WindowsError.h"
@@ -224,7 +225,7 @@ void SharedMemoryMapper::reserve(size_t NumBytes,
int SharedMemoryId = -1;
EPC.callSPSWrapperAsync<
- rt::SPSExecutorSharedMemoryMapperServiceReserveSignature>(
+ rt::sps_ci::SharedMemoryMapperReserve::SPSSig>(
SAs.Reserve,
[this, NumBytes, OnReserved = std::move(OnReserved), SharedMemoryId](
Error SerializationErr,
@@ -356,7 +357,7 @@ void SharedMemoryMapper::initialize(MemoryMapper::AllocInfo &AI,
}
EPC.callSPSWrapperAsync<
- rt::SPSExecutorSharedMemoryMapperServiceInitializeSignature>(
+ rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>(
SAs.Initialize,
[OnInitialized = std::move(OnInitialized)](
Error SerializationErr, Expected<ExecutorAddr> Result) mutable {
@@ -374,7 +375,7 @@ void SharedMemoryMapper::deinitialize(
ArrayRef<ExecutorAddr> Allocations,
MemoryMapper::OnDeinitializedFunction OnDeinitialized) {
EPC.callSPSWrapperAsync<
- rt::SPSExecutorSharedMemoryMapperServiceDeinitializeSignature>(
+ rt::sps_ci::SharedMemoryMapperDeinitialize::SPSSig>(
SAs.Deinitialize,
[OnDeinitialized = std::move(OnDeinitialized)](Error SerializationErr,
Error Result) mutable {
@@ -422,7 +423,7 @@ void SharedMemoryMapper::release(ArrayRef<ExecutorAddr> Bases,
}
EPC.callSPSWrapperAsync<
- rt::SPSExecutorSharedMemoryMapperServiceReleaseSignature>(
+ rt::sps_ci::SharedMemoryMapperRelease::SPSSig>(
SAs.Release,
[OnReleased = std::move(OnReleased),
Err = std::move(Err)](Error SerializationErr, Error Result) mutable {
diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp
index 9cd8ffae07cc8..36641f4290119 100644
--- a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp
@@ -23,17 +23,6 @@ const char *SimpleExecutorMemoryManagerDeinitializeWrapperName =
const char *SimpleExecutorMemoryManagerReleaseWrapperName =
"__llvm_orc_SimpleExecutorMemoryManager_release_wrapper";
-const char *ExecutorSharedMemoryMapperServiceInstanceName =
- "__llvm_orc_ExecutorSharedMemoryMapperService_Instance";
-const char *ExecutorSharedMemoryMapperServiceReserveWrapperName =
- "__llvm_orc_ExecutorSharedMemoryMapperService_Reserve";
-const char *ExecutorSharedMemoryMapperServiceInitializeWrapperName =
- "__llvm_orc_ExecutorSharedMemoryMapperService_Initialize";
-const char *ExecutorSharedMemoryMapperServiceDeinitializeWrapperName =
- "__llvm_orc_ExecutorSharedMemoryMapperService_Deinitialize";
-const char *ExecutorSharedMemoryMapperServiceReleaseWrapperName =
- "__llvm_orc_ExecutorSharedMemoryMapperService_Release";
-
const char *RegisterEHFrameSectionAllocActionName =
"llvm_orc_registerEHFrameAllocAction";
const char *DeregisterEHFrameSectionAllocActionName =
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
index 423a1bd496c96..8dcb1593d8321 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
@@ -9,6 +9,7 @@
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h"
#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
+#include "llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/WindowsError.h"
#include <sstream>
@@ -309,15 +310,15 @@ Error ExecutorSharedMemoryMapperService::shutdown() {
void ExecutorSharedMemoryMapperService::addBootstrapSymbols(
StringMap<ExecutorAddr> &M) {
- M[rt::ExecutorSharedMemoryMapperServiceInstanceName] =
+ M[rt::sps_ci::SharedMemoryMapperInstanceName] =
ExecutorAddr::fromPtr(this);
- M[rt::ExecutorSharedMemoryMapperServiceReserveWrapperName] =
+ M[rt::sps_ci::SharedMemoryMapperReserve::Name] =
ExecutorAddr::fromPtr(&reserveWrapper);
- M[rt::ExecutorSharedMemoryMapperServiceInitializeWrapperName] =
+ M[rt::sps_ci::SharedMemoryMapperInitialize::Name] =
ExecutorAddr::fromPtr(&initializeWrapper);
- M[rt::ExecutorSharedMemoryMapperServiceDeinitializeWrapperName] =
+ M[rt::sps_ci::SharedMemoryMapperDeinitialize::Name] =
ExecutorAddr::fromPtr(&deinitializeWrapper);
- M[rt::ExecutorSharedMemoryMapperServiceReleaseWrapperName] =
+ M[rt::sps_ci::SharedMemoryMapperRelease::Name] =
ExecutorAddr::fromPtr(&releaseWrapper);
}
@@ -325,7 +326,7 @@ llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::reserveWrapper(const char *ArgData,
size_t ArgSize) {
return shared::WrapperFunction<
- rt::SPSExecutorSharedMemoryMapperServiceReserveSignature>::
+ rt::sps_ci::SharedMemoryMapperReserve::SPSSig>::
handle(ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::reserve))
@@ -336,7 +337,7 @@ llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::initializeWrapper(const char *ArgData,
size_t ArgSize) {
return shared::WrapperFunction<
- rt::SPSExecutorSharedMemoryMapperServiceInitializeSignature>::
+ rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>::
handle(ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::initialize))
@@ -347,7 +348,7 @@ llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::deinitializeWrapper(const char *ArgData,
size_t ArgSize) {
return shared::WrapperFunction<
- rt::SPSExecutorSharedMemoryMapperServiceDeinitializeSignature>::
+ rt::sps_ci::SharedMemoryMapperDeinitialize::SPSSig>::
handle(ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::deinitialize))
@@ -358,7 +359,7 @@ llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::releaseWrapper(const char *ArgData,
size_t ArgSize) {
return shared::WrapperFunction<
- rt::SPSExecutorSharedMemoryMapperServiceReleaseSignature>::
+ rt::sps_ci::SharedMemoryMapperRelease::SPSSig>::
handle(ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::release))
diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
index da99e17f12df1..142110766414b 100644
--- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
+++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -40,6 +40,7 @@
#include "llvm/ExecutionEngine/Orc/SectCreate.h"
#include "llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h"
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
+#include "llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h"
#include "llvm/ExecutionEngine/Orc/SimpleMemoryMapSPS.h"
#include "llvm/ExecutionEngine/Orc/SimpleRemoteMemoryMapper.h"
#include "llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h"
@@ -779,15 +780,15 @@ Expected<std::unique_ptr<jitlink::JITLinkMemoryManager>>
createSharedMemoryManager(ExecutorProcessControl &EPC) {
SharedMemoryMapper::SymbolAddrs SAs;
if (auto Err = EPC.getBootstrapSymbols(
- {{SAs.Instance, rt::ExecutorSharedMemoryMapperServiceInstanceName},
+ {{SAs.Instance, rt::sps_ci::SharedMemoryMapperInstanceName},
{SAs.Reserve,
- rt::ExecutorSharedMemoryMapperServiceReserveWrapperName},
+ rt::sps_ci::SharedMemoryMapperReserve::Name},
{SAs.Initialize,
- rt::ExecutorSharedMemoryMapperServiceInitializeWrapperName},
+ rt::sps_ci::SharedMemoryMapperInitialize::Name},
{SAs.Deinitialize,
- rt::ExecutorSharedMemoryMapperServiceDeinitializeWrapperName},
+ rt::sps_ci::SharedMemoryMapperDeinitialize::Name},
{SAs.Release,
- rt::ExecutorSharedMemoryMapperServiceReleaseWrapperName}}))
+ rt::sps_ci::SharedMemoryMapperRelease::Name}}))
return std::move(Err);
#ifdef _WIN32
diff --git a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
index 025b32c1f4b5b..50a2e866e39a0 100644
--- a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
@@ -12,6 +12,7 @@
#include "llvm/ExecutionEngine/Orc/MemoryMapper.h"
#include "llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h"
#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
+#include "llvm/ExecutionEngine/Orc/Shared/SPSCI/SharedMemoryMapperSPSCI.h"
#include "llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h"
#include "llvm/Testing/Support/Error.h"
@@ -47,13 +48,13 @@ TEST(SharedMemoryMapperTest, MemReserveInitializeDeinitializeRelease) {
{
StringMap<ExecutorAddr> Map;
MapperService.addBootstrapSymbols(Map);
- SAs.Instance = Map[rt::ExecutorSharedMemoryMapperServiceInstanceName];
- SAs.Reserve = Map[rt::ExecutorSharedMemoryMapperServiceReserveWrapperName];
+ SAs.Instance = Map[rt::sps_ci::SharedMemoryMapperInstanceName];
+ SAs.Reserve = Map[rt::sps_ci::SharedMemoryMapperReserve::Name];
SAs.Initialize =
- Map[rt::ExecutorSharedMemoryMapperServiceInitializeWrapperName];
+ Map[rt::sps_ci::SharedMemoryMapperInitialize::Name];
SAs.Deinitialize =
- Map[rt::ExecutorSharedMemoryMapperServiceDeinitializeWrapperName];
- SAs.Release = Map[rt::ExecutorSharedMemoryMapperServiceReleaseWrapperName];
+ Map[rt::sps_ci::SharedMemoryMapperDeinitialize::Name];
+ SAs.Release = Map[rt::sps_ci::SharedMemoryMapperRelease::Name];
}
std::string TestString = "Hello, World!";
>From 984db0aa8306553a31ed9d4a8760b4582ded0c92 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Fri, 11 Sep 2026 13:54:26 +1000
Subject: [PATCH 2/2] clang-format
---
llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp | 12 ++++-------
.../ExecutorSharedMemoryMapperService.cpp | 21 +++++++++----------
llvm/tools/llvm-jitlink/llvm-jitlink.cpp | 12 ++++-------
.../Orc/SharedMemoryMapperTest.cpp | 6 ++----
4 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
index 77d6fed83db75..bda14c17d81d6 100644
--- a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
@@ -224,8 +224,7 @@ void SharedMemoryMapper::reserve(size_t NumBytes,
#if (defined(LLVM_ON_UNIX) && !defined(__ANDROID__)) || defined(_WIN32)
int SharedMemoryId = -1;
- EPC.callSPSWrapperAsync<
- rt::sps_ci::SharedMemoryMapperReserve::SPSSig>(
+ EPC.callSPSWrapperAsync<rt::sps_ci::SharedMemoryMapperReserve::SPSSig>(
SAs.Reserve,
[this, NumBytes, OnReserved = std::move(OnReserved), SharedMemoryId](
Error SerializationErr,
@@ -356,8 +355,7 @@ void SharedMemoryMapper::initialize(MemoryMapper::AllocInfo &AI,
FR.Segments.push_back(SegReq);
}
- EPC.callSPSWrapperAsync<
- rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>(
+ EPC.callSPSWrapperAsync<rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>(
SAs.Initialize,
[OnInitialized = std::move(OnInitialized)](
Error SerializationErr, Expected<ExecutorAddr> Result) mutable {
@@ -374,8 +372,7 @@ void SharedMemoryMapper::initialize(MemoryMapper::AllocInfo &AI,
void SharedMemoryMapper::deinitialize(
ArrayRef<ExecutorAddr> Allocations,
MemoryMapper::OnDeinitializedFunction OnDeinitialized) {
- EPC.callSPSWrapperAsync<
- rt::sps_ci::SharedMemoryMapperDeinitialize::SPSSig>(
+ EPC.callSPSWrapperAsync<rt::sps_ci::SharedMemoryMapperDeinitialize::SPSSig>(
SAs.Deinitialize,
[OnDeinitialized = std::move(OnDeinitialized)](Error SerializationErr,
Error Result) mutable {
@@ -422,8 +419,7 @@ void SharedMemoryMapper::release(ArrayRef<ExecutorAddr> Bases,
}
}
- EPC.callSPSWrapperAsync<
- rt::sps_ci::SharedMemoryMapperRelease::SPSSig>(
+ EPC.callSPSWrapperAsync<rt::sps_ci::SharedMemoryMapperRelease::SPSSig>(
SAs.Release,
[OnReleased = std::move(OnReleased),
Err = std::move(Err)](Error SerializationErr, Error Result) mutable {
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
index 8dcb1593d8321..bc09eb84868ef 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp
@@ -310,8 +310,7 @@ Error ExecutorSharedMemoryMapperService::shutdown() {
void ExecutorSharedMemoryMapperService::addBootstrapSymbols(
StringMap<ExecutorAddr> &M) {
- M[rt::sps_ci::SharedMemoryMapperInstanceName] =
- ExecutorAddr::fromPtr(this);
+ M[rt::sps_ci::SharedMemoryMapperInstanceName] = ExecutorAddr::fromPtr(this);
M[rt::sps_ci::SharedMemoryMapperReserve::Name] =
ExecutorAddr::fromPtr(&reserveWrapper);
M[rt::sps_ci::SharedMemoryMapperInitialize::Name] =
@@ -325,9 +324,9 @@ void ExecutorSharedMemoryMapperService::addBootstrapSymbols(
llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::reserveWrapper(const char *ArgData,
size_t ArgSize) {
- return shared::WrapperFunction<
- rt::sps_ci::SharedMemoryMapperReserve::SPSSig>::
- handle(ArgData, ArgSize,
+ return shared::
+ WrapperFunction<rt::sps_ci::SharedMemoryMapperReserve::SPSSig>::handle(
+ ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::reserve))
.release();
@@ -336,9 +335,9 @@ ExecutorSharedMemoryMapperService::reserveWrapper(const char *ArgData,
llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::initializeWrapper(const char *ArgData,
size_t ArgSize) {
- return shared::WrapperFunction<
- rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>::
- handle(ArgData, ArgSize,
+ return shared::
+ WrapperFunction<rt::sps_ci::SharedMemoryMapperInitialize::SPSSig>::handle(
+ ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::initialize))
.release();
@@ -358,9 +357,9 @@ ExecutorSharedMemoryMapperService::deinitializeWrapper(const char *ArgData,
llvm::orc::shared::CWrapperFunctionBuffer
ExecutorSharedMemoryMapperService::releaseWrapper(const char *ArgData,
size_t ArgSize) {
- return shared::WrapperFunction<
- rt::sps_ci::SharedMemoryMapperRelease::SPSSig>::
- handle(ArgData, ArgSize,
+ return shared::
+ WrapperFunction<rt::sps_ci::SharedMemoryMapperRelease::SPSSig>::handle(
+ ArgData, ArgSize,
shared::makeMethodWrapperHandler(
&ExecutorSharedMemoryMapperService::release))
.release();
diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
index 142110766414b..5dc799fed370c 100644
--- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
+++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -781,14 +781,10 @@ createSharedMemoryManager(ExecutorProcessControl &EPC) {
SharedMemoryMapper::SymbolAddrs SAs;
if (auto Err = EPC.getBootstrapSymbols(
{{SAs.Instance, rt::sps_ci::SharedMemoryMapperInstanceName},
- {SAs.Reserve,
- rt::sps_ci::SharedMemoryMapperReserve::Name},
- {SAs.Initialize,
- rt::sps_ci::SharedMemoryMapperInitialize::Name},
- {SAs.Deinitialize,
- rt::sps_ci::SharedMemoryMapperDeinitialize::Name},
- {SAs.Release,
- rt::sps_ci::SharedMemoryMapperRelease::Name}}))
+ {SAs.Reserve, rt::sps_ci::SharedMemoryMapperReserve::Name},
+ {SAs.Initialize, rt::sps_ci::SharedMemoryMapperInitialize::Name},
+ {SAs.Deinitialize, rt::sps_ci::SharedMemoryMapperDeinitialize::Name},
+ {SAs.Release, rt::sps_ci::SharedMemoryMapperRelease::Name}}))
return std::move(Err);
#ifdef _WIN32
diff --git a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
index 50a2e866e39a0..8afc0dd0fad4b 100644
--- a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
@@ -50,10 +50,8 @@ TEST(SharedMemoryMapperTest, MemReserveInitializeDeinitializeRelease) {
MapperService.addBootstrapSymbols(Map);
SAs.Instance = Map[rt::sps_ci::SharedMemoryMapperInstanceName];
SAs.Reserve = Map[rt::sps_ci::SharedMemoryMapperReserve::Name];
- SAs.Initialize =
- Map[rt::sps_ci::SharedMemoryMapperInitialize::Name];
- SAs.Deinitialize =
- Map[rt::sps_ci::SharedMemoryMapperDeinitialize::Name];
+ SAs.Initialize = Map[rt::sps_ci::SharedMemoryMapperInitialize::Name];
+ SAs.Deinitialize = Map[rt::sps_ci::SharedMemoryMapperDeinitialize::Name];
SAs.Release = Map[rt::sps_ci::SharedMemoryMapperRelease::Name];
}
More information about the llvm-commits
mailing list