[llvm] 853849a - [ORC] Remove some unnecessary namespace qualifications. NFCI.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 12 20:15:08 PDT 2025
Author: Lang Hames
Date: 2025-03-13T14:15:01+11:00
New Revision: 853849a984dd7d47b86ab50ef74b9820a538c999
URL: https://github.com/llvm/llvm-project/commit/853849a984dd7d47b86ab50ef74b9820a538c999
DIFF: https://github.com/llvm/llvm-project/commit/853849a984dd7d47b86ab50ef74b9820a538c999.diff
LOG: [ORC] Remove some unnecessary namespace qualifications. NFCI.
Added:
Modified:
llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp
llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp
llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp
Removed:
################################################################################
diff --git a/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
index 93707bc52a5a9..6c04ab774c2e9 100644
--- a/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp
@@ -78,24 +78,21 @@ class SimpleAllocator {
DenseMap<void *, sys::OwningMemoryBlock> Blocks;
};
-llvm::orc::shared::CWrapperFunctionResult testReserve(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testReserve(const char *ArgData, size_t ArgSize) {
return WrapperFunction<rt::SPSSimpleExecutorMemoryManagerReserveSignature>::
handle(ArgData, ArgSize,
makeMethodWrapperHandler(&SimpleAllocator::reserve))
.release();
}
-llvm::orc::shared::CWrapperFunctionResult testFinalize(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testFinalize(const char *ArgData, size_t ArgSize) {
return WrapperFunction<rt::SPSSimpleExecutorMemoryManagerFinalizeSignature>::
handle(ArgData, ArgSize,
makeMethodWrapperHandler(&SimpleAllocator::finalize))
.release();
}
-llvm::orc::shared::CWrapperFunctionResult testDeallocate(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testDeallocate(const char *ArgData, size_t ArgSize) {
return WrapperFunction<
rt::SPSSimpleExecutorMemoryManagerDeallocateSignature>::
handle(ArgData, ArgSize,
@@ -116,7 +113,7 @@ TEST(EPCGenericJITLinkMemoryManagerTest, AllocFinalizeFree) {
auto MemMgr = std::make_unique<EPCGenericJITLinkMemoryManager>(*SelfEPC, SAs);
StringRef Hello = "hello";
auto SSA = jitlink::SimpleSegmentAlloc::Create(
- *MemMgr, std::make_shared<orc::SymbolStringPool>(),
+ *MemMgr, std::make_shared<SymbolStringPool>(),
Triple("x86_64-apple-darwin"), nullptr,
{{MemProt::Read, {Hello.size(), Align(1)}}});
EXPECT_THAT_EXPECTED(SSA, Succeeded());
diff --git a/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp b/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
index 1aab70babc81a..3eec564ee629f 100644
--- a/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp
@@ -18,8 +18,7 @@ using namespace llvm::orc::shared;
namespace {
template <typename WriteT, typename SPSWriteT>
-llvm::orc::shared::CWrapperFunctionResult testWriteUInts(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testWriteUInts(const char *ArgData, size_t ArgSize) {
return WrapperFunction<void(SPSSequence<SPSWriteT>)>::handle(
ArgData, ArgSize,
[](std::vector<WriteT> Ws) {
@@ -29,8 +28,7 @@ llvm::orc::shared::CWrapperFunctionResult testWriteUInts(const char *ArgData,
.release();
}
-llvm::orc::shared::CWrapperFunctionResult testWriteBuffers(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testWriteBuffers(const char *ArgData, size_t ArgSize) {
return WrapperFunction<void(SPSSequence<SPSMemoryAccessBufferWrite>)>::handle(
ArgData, ArgSize,
[](std::vector<tpctypes::BufferWrite> Ws) {
@@ -41,8 +39,7 @@ llvm::orc::shared::CWrapperFunctionResult testWriteBuffers(const char *ArgData,
.release();
}
-llvm::orc::shared::CWrapperFunctionResult testWritePointers(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult testWritePointers(const char *ArgData, size_t ArgSize) {
return WrapperFunction<void(SPSSequence<SPSMemoryAccessPointerWrite>)>::
handle(ArgData, ArgSize,
[](std::vector<tpctypes::PointerWrite> Ws) {
diff --git a/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp b/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
index a25da8a727de5..80b9c157f7623 100644
--- a/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
@@ -19,8 +19,7 @@ using namespace llvm;
using namespace llvm::orc;
using namespace llvm::orc::shared;
-static llvm::orc::shared::CWrapperFunctionResult addWrapper(const char *ArgData,
- size_t ArgSize) {
+static CWrapperFunctionResult addWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<int32_t(int32_t, int32_t)>::handle(
ArgData, ArgSize, [](int32_t X, int32_t Y) { return X + Y; })
.release();
@@ -31,8 +30,7 @@ static void addAsyncWrapper(unique_function<void(int32_t)> SendResult,
SendResult(X + Y);
}
-static llvm::orc::shared::CWrapperFunctionResult
-voidWrapper(const char *ArgData, size_t ArgSize) {
+static CWrapperFunctionResult voidWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<void()>::handle(ArgData, ArgSize, []() {}).release();
}
diff --git a/llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp
index d6ce80821641c..c5e9d4368ed93 100644
--- a/llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp
@@ -76,7 +76,7 @@ TEST(MapperJITLinkMemoryManagerTest, InProcess) {
StringRef Hello = "hello";
auto SSA1 = jitlink::SimpleSegmentAlloc::Create(
- *MemMgr, std::make_shared<orc::SymbolStringPool>(),
+ *MemMgr, std::make_shared<SymbolStringPool>(),
Triple("x86_64-apple-darwin"), nullptr,
{{MemProt::Read, {Hello.size(), Align(1)}}});
EXPECT_THAT_EXPECTED(SSA1, Succeeded());
@@ -94,7 +94,7 @@ TEST(MapperJITLinkMemoryManagerTest, InProcess) {
EXPECT_EQ(Counter->InitCount, 1);
auto SSA2 = jitlink::SimpleSegmentAlloc::Create(
- *MemMgr, std::make_shared<orc::SymbolStringPool>(),
+ *MemMgr, std::make_shared<SymbolStringPool>(),
Triple("x86_64-apple-darwin"), nullptr,
{{MemProt::Read, {Hello.size(), Align(1)}}});
EXPECT_THAT_EXPECTED(SSA2, Succeeded());
@@ -139,7 +139,7 @@ TEST(MapperJITLinkMemoryManagerTest, Coalescing) {
auto Mapper = cantFail(InProcessMemoryMapper::Create());
auto MemMgr = std::make_unique<MapperJITLinkMemoryManager>(16 * 1024 * 1024,
std::move(Mapper));
- auto SSP = std::make_shared<orc::SymbolStringPool>();
+ auto SSP = std::make_shared<SymbolStringPool>();
auto SSA1 = jitlink::SimpleSegmentAlloc::Create(
*MemMgr, SSP, Triple("x86_64-apple-darwin"), nullptr,
diff --git a/llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp b/llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp
index e015bd09d354b..6ab659d38f5ca 100644
--- a/llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp
@@ -48,8 +48,7 @@ Error release(MemoryMapper &M, const std::vector<ExecutorAddr> &Reservations) {
}
// A basic function to be used as both initializer/deinitializer
-orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
ArgData, ArgSize,
[](ExecutorAddr A) -> Error {
diff --git a/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
index 415ad0ee80577..0c2c06ec75d6e 100644
--- a/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp
@@ -50,8 +50,8 @@ TEST_F(ObjectLinkingLayerTest, AddLinkGraph) {
SubtargetFeatures(), x86_64::getEdgeKindName);
auto &Sec1 = G->createSection("__data", MemProt::Read | MemProt::Write);
- auto &B1 = G->createContentBlock(Sec1, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ auto &B1 =
+ G->createContentBlock(Sec1, BlockContent, ExecutorAddr(0x1000), 8, 0);
G->addDefinedSymbol(B1, 4, "_X", 4, Linkage::Strong, Scope::Default, false,
false);
G->addDefinedSymbol(B1, 4, "_Y", 4, Linkage::Weak, Scope::Default, false,
@@ -77,8 +77,8 @@ TEST_F(ObjectLinkingLayerTest, ResourceTracker) {
SubtargetFeatures(), x86_64::getEdgeKindName);
auto &Sec1 = G->createSection("__data", MemProt::Read | MemProt::Write);
- auto &B1 = G->createContentBlock(Sec1, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ auto &B1 =
+ G->createContentBlock(Sec1, BlockContent, ExecutorAddr(0x1000), 8, 0);
llvm::SmallString<0> SymbolName;
SymbolName += "_X";
SymbolName += std::to_string(I);
@@ -109,15 +109,15 @@ TEST_F(ObjectLinkingLayerTest, ClaimLateDefinedWeakSymbols) {
Config.PrePrunePasses.insert(
Config.PrePrunePasses.begin(), [](LinkGraph &G) {
auto *DataSec = G.findSectionByName("__data");
- auto &DataBlock = G.createContentBlock(
- *DataSec, BlockContent, orc::ExecutorAddr(0x2000), 8, 0);
+ auto &DataBlock = G.createContentBlock(*DataSec, BlockContent,
+ ExecutorAddr(0x2000), 8, 0);
G.addDefinedSymbol(DataBlock, 4, "_x", 4, Linkage::Weak,
Scope::Default, false, false);
auto &TextSec =
G.createSection("__text", MemProt::Read | MemProt::Write);
- auto &FuncBlock = G.createContentBlock(
- TextSec, BlockContent, orc::ExecutorAddr(0x3000), 8, 0);
+ auto &FuncBlock = G.createContentBlock(TextSec, BlockContent,
+ ExecutorAddr(0x3000), 8, 0);
G.addDefinedSymbol(FuncBlock, 4, "_f", 4, Linkage::Weak,
Scope::Default, true, false);
@@ -144,8 +144,8 @@ TEST_F(ObjectLinkingLayerTest, ClaimLateDefinedWeakSymbols) {
SubtargetFeatures(), getGenericEdgeKindName);
auto &DataSec = G->createSection("__data", MemProt::Read | MemProt::Write);
- auto &DataBlock = G->createContentBlock(DataSec, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ auto &DataBlock =
+ G->createContentBlock(DataSec, BlockContent, ExecutorAddr(0x1000), 8, 0);
G->addDefinedSymbol(DataBlock, 4, "_anchor", 4, Linkage::Weak, Scope::Default,
false, true);
@@ -197,8 +197,8 @@ TEST_F(ObjectLinkingLayerTest, HandleErrorDuringPostAllocationPass) {
SubtargetFeatures(), getGenericEdgeKindName);
auto &DataSec = G->createSection("__data", MemProt::Read | MemProt::Write);
- auto &DataBlock = G->createContentBlock(DataSec, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ auto &DataBlock =
+ G->createContentBlock(DataSec, BlockContent, ExecutorAddr(0x1000), 8, 0);
G->addDefinedSymbol(DataBlock, 4, "_anchor", 4, Linkage::Weak, Scope::Default,
false, true);
@@ -252,7 +252,7 @@ TEST_F(ObjectLinkingLayerTest, AddAndRemovePlugins) {
auto &DataSec = G1->createSection("__data", MemProt::Read | MemProt::Write);
auto &DataBlock = G1->createContentBlock(DataSec, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ ExecutorAddr(0x1000), 8, 0);
G1->addDefinedSymbol(DataBlock, 4, "_anchor1", 4, Linkage::Weak,
Scope::Default, false, true);
@@ -270,7 +270,7 @@ TEST_F(ObjectLinkingLayerTest, AddAndRemovePlugins) {
auto &DataSec = G2->createSection("__data", MemProt::Read | MemProt::Write);
auto &DataBlock = G2->createContentBlock(DataSec, BlockContent,
- orc::ExecutorAddr(0x1000), 8, 0);
+ ExecutorAddr(0x1000), 8, 0);
G2->addDefinedSymbol(DataBlock, 4, "_anchor2", 4, Linkage::Weak,
Scope::Default, false, true);
diff --git a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
index 64efb49cff6e9..0449ec6f7fbc0 100644
--- a/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp
@@ -21,8 +21,7 @@ using namespace llvm::orc::rt_bootstrap;
#if (defined(LLVM_ON_UNIX) && !defined(__ANDROID__)) || defined(_WIN32)
// A basic function to be used as both initializer/deinitializer
-orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
ArgData, ArgSize,
[](ExecutorAddr A) -> Error {
diff --git a/llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp
index cb42bca3690b9..6e9b0b2d8c73f 100644
--- a/llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp
@@ -20,8 +20,7 @@ using namespace llvm::orc::rt_bootstrap;
namespace {
-orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
- size_t ArgSize) {
+CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
ArgData, ArgSize,
[](ExecutorAddr A) -> Error {
More information about the llvm-commits
mailing list