Skip to content

Commit 853849a

Browse files
lhameslhames
committed
[ORC] Remove some unnecessary namespace qualifications. NFCI.
1 parent 0a78bd6 commit 853849a

8 files changed

+29
-40
lines changed

‎llvm/unittests/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManagerTest.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,21 @@ class SimpleAllocator {
7878
DenseMap<void *, sys::OwningMemoryBlock> Blocks;
7979
};
8080

81-
llvm::orc::shared::CWrapperFunctionResult testReserve(const char *ArgData,
82-
size_t ArgSize) {
81+
CWrapperFunctionResult testReserve(const char *ArgData, size_t ArgSize) {
8382
return WrapperFunction<rt::SPSSimpleExecutorMemoryManagerReserveSignature>::
8483
handle(ArgData, ArgSize,
8584
makeMethodWrapperHandler(&SimpleAllocator::reserve))
8685
.release();
8786
}
8887

89-
llvm::orc::shared::CWrapperFunctionResult testFinalize(const char *ArgData,
90-
size_t ArgSize) {
88+
CWrapperFunctionResult testFinalize(const char *ArgData, size_t ArgSize) {
9189
return WrapperFunction<rt::SPSSimpleExecutorMemoryManagerFinalizeSignature>::
9290
handle(ArgData, ArgSize,
9391
makeMethodWrapperHandler(&SimpleAllocator::finalize))
9492
.release();
9593
}
9694

97-
llvm::orc::shared::CWrapperFunctionResult testDeallocate(const char *ArgData,
98-
size_t ArgSize) {
95+
CWrapperFunctionResult testDeallocate(const char *ArgData, size_t ArgSize) {
9996
return WrapperFunction<
10097
rt::SPSSimpleExecutorMemoryManagerDeallocateSignature>::
10198
handle(ArgData, ArgSize,
@@ -116,7 +113,7 @@ TEST(EPCGenericJITLinkMemoryManagerTest, AllocFinalizeFree) {
116113
auto MemMgr = std::make_unique<EPCGenericJITLinkMemoryManager>(*SelfEPC, SAs);
117114
StringRef Hello = "hello";
118115
auto SSA = jitlink::SimpleSegmentAlloc::Create(
119-
*MemMgr, std::make_shared<orc::SymbolStringPool>(),
116+
*MemMgr, std::make_shared<SymbolStringPool>(),
120117
Triple("x86_64-apple-darwin"), nullptr,
121118
{{MemProt::Read, {Hello.size(), Align(1)}}});
122119
EXPECT_THAT_EXPECTED(SSA, Succeeded());

‎llvm/unittests/ExecutionEngine/Orc/EPCGenericMemoryAccessTest.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ using namespace llvm::orc::shared;
1818
namespace {
1919

2020
template <typename WriteT, typename SPSWriteT>
21-
llvm::orc::shared::CWrapperFunctionResult testWriteUInts(const char *ArgData,
22-
size_t ArgSize) {
21+
CWrapperFunctionResult testWriteUInts(const char *ArgData, size_t ArgSize) {
2322
return WrapperFunction<void(SPSSequence<SPSWriteT>)>::handle(
2423
ArgData, ArgSize,
2524
[](std::vector<WriteT> Ws) {
@@ -29,8 +28,7 @@ llvm::orc::shared::CWrapperFunctionResult testWriteUInts(const char *ArgData,
2928
.release();
3029
}
3130

32-
llvm::orc::shared::CWrapperFunctionResult testWriteBuffers(const char *ArgData,
33-
size_t ArgSize) {
31+
CWrapperFunctionResult testWriteBuffers(const char *ArgData, size_t ArgSize) {
3432
return WrapperFunction<void(SPSSequence<SPSMemoryAccessBufferWrite>)>::handle(
3533
ArgData, ArgSize,
3634
[](std::vector<tpctypes::BufferWrite> Ws) {
@@ -41,8 +39,7 @@ llvm::orc::shared::CWrapperFunctionResult testWriteBuffers(const char *ArgData,
4139
.release();
4240
}
4341

44-
llvm::orc::shared::CWrapperFunctionResult testWritePointers(const char *ArgData,
45-
size_t ArgSize) {
42+
CWrapperFunctionResult testWritePointers(const char *ArgData, size_t ArgSize) {
4643
return WrapperFunction<void(SPSSequence<SPSMemoryAccessPointerWrite>)>::
4744
handle(ArgData, ArgSize,
4845
[](std::vector<tpctypes::PointerWrite> Ws) {

‎llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ using namespace llvm;
1919
using namespace llvm::orc;
2020
using namespace llvm::orc::shared;
2121

22-
static llvm::orc::shared::CWrapperFunctionResult addWrapper(const char *ArgData,
23-
size_t ArgSize) {
22+
static CWrapperFunctionResult addWrapper(const char *ArgData, size_t ArgSize) {
2423
return WrapperFunction<int32_t(int32_t, int32_t)>::handle(
2524
ArgData, ArgSize, [](int32_t X, int32_t Y) { return X + Y; })
2625
.release();
@@ -31,8 +30,7 @@ static void addAsyncWrapper(unique_function<void(int32_t)> SendResult,
3130
SendResult(X + Y);
3231
}
3332

34-
static llvm::orc::shared::CWrapperFunctionResult
35-
voidWrapper(const char *ArgData, size_t ArgSize) {
33+
static CWrapperFunctionResult voidWrapper(const char *ArgData, size_t ArgSize) {
3634
return WrapperFunction<void()>::handle(ArgData, ArgSize, []() {}).release();
3735
}
3836

‎llvm/unittests/ExecutionEngine/Orc/MapperJITLinkMemoryManagerTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ TEST(MapperJITLinkMemoryManagerTest, InProcess) {
7676

7777
StringRef Hello = "hello";
7878
auto SSA1 = jitlink::SimpleSegmentAlloc::Create(
79-
*MemMgr, std::make_shared<orc::SymbolStringPool>(),
79+
*MemMgr, std::make_shared<SymbolStringPool>(),
8080
Triple("x86_64-apple-darwin"), nullptr,
8181
{{MemProt::Read, {Hello.size(), Align(1)}}});
8282
EXPECT_THAT_EXPECTED(SSA1, Succeeded());
@@ -94,7 +94,7 @@ TEST(MapperJITLinkMemoryManagerTest, InProcess) {
9494
EXPECT_EQ(Counter->InitCount, 1);
9595

9696
auto SSA2 = jitlink::SimpleSegmentAlloc::Create(
97-
*MemMgr, std::make_shared<orc::SymbolStringPool>(),
97+
*MemMgr, std::make_shared<SymbolStringPool>(),
9898
Triple("x86_64-apple-darwin"), nullptr,
9999
{{MemProt::Read, {Hello.size(), Align(1)}}});
100100
EXPECT_THAT_EXPECTED(SSA2, Succeeded());
@@ -139,7 +139,7 @@ TEST(MapperJITLinkMemoryManagerTest, Coalescing) {
139139
auto Mapper = cantFail(InProcessMemoryMapper::Create());
140140
auto MemMgr = std::make_unique<MapperJITLinkMemoryManager>(16 * 1024 * 1024,
141141
std::move(Mapper));
142-
auto SSP = std::make_shared<orc::SymbolStringPool>();
142+
auto SSP = std::make_shared<SymbolStringPool>();
143143

144144
auto SSA1 = jitlink::SimpleSegmentAlloc::Create(
145145
*MemMgr, SSP, Triple("x86_64-apple-darwin"), nullptr,

‎llvm/unittests/ExecutionEngine/Orc/MemoryMapperTest.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ Error release(MemoryMapper &M, const std::vector<ExecutorAddr> &Reservations) {
4848
}
4949

5050
// A basic function to be used as both initializer/deinitializer
51-
orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
52-
size_t ArgSize) {
51+
CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
5352
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
5453
ArgData, ArgSize,
5554
[](ExecutorAddr A) -> Error {

‎llvm/unittests/ExecutionEngine/Orc/ObjectLinkingLayerTest.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ TEST_F(ObjectLinkingLayerTest, AddLinkGraph) {
5050
SubtargetFeatures(), x86_64::getEdgeKindName);
5151

5252
auto &Sec1 = G->createSection("__data", MemProt::Read | MemProt::Write);
53-
auto &B1 = G->createContentBlock(Sec1, BlockContent,
54-
orc::ExecutorAddr(0x1000), 8, 0);
53+
auto &B1 =
54+
G->createContentBlock(Sec1, BlockContent, ExecutorAddr(0x1000), 8, 0);
5555
G->addDefinedSymbol(B1, 4, "_X", 4, Linkage::Strong, Scope::Default, false,
5656
false);
5757
G->addDefinedSymbol(B1, 4, "_Y", 4, Linkage::Weak, Scope::Default, false,
@@ -77,8 +77,8 @@ TEST_F(ObjectLinkingLayerTest, ResourceTracker) {
7777
SubtargetFeatures(), x86_64::getEdgeKindName);
7878

7979
auto &Sec1 = G->createSection("__data", MemProt::Read | MemProt::Write);
80-
auto &B1 = G->createContentBlock(Sec1, BlockContent,
81-
orc::ExecutorAddr(0x1000), 8, 0);
80+
auto &B1 =
81+
G->createContentBlock(Sec1, BlockContent, ExecutorAddr(0x1000), 8, 0);
8282
llvm::SmallString<0> SymbolName;
8383
SymbolName += "_X";
8484
SymbolName += std::to_string(I);
@@ -109,15 +109,15 @@ TEST_F(ObjectLinkingLayerTest, ClaimLateDefinedWeakSymbols) {
109109
Config.PrePrunePasses.insert(
110110
Config.PrePrunePasses.begin(), [](LinkGraph &G) {
111111
auto *DataSec = G.findSectionByName("__data");
112-
auto &DataBlock = G.createContentBlock(
113-
*DataSec, BlockContent, orc::ExecutorAddr(0x2000), 8, 0);
112+
auto &DataBlock = G.createContentBlock(*DataSec, BlockContent,
113+
ExecutorAddr(0x2000), 8, 0);
114114
G.addDefinedSymbol(DataBlock, 4, "_x", 4, Linkage::Weak,
115115
Scope::Default, false, false);
116116

117117
auto &TextSec =
118118
G.createSection("__text", MemProt::Read | MemProt::Write);
119-
auto &FuncBlock = G.createContentBlock(
120-
TextSec, BlockContent, orc::ExecutorAddr(0x3000), 8, 0);
119+
auto &FuncBlock = G.createContentBlock(TextSec, BlockContent,
120+
ExecutorAddr(0x3000), 8, 0);
121121
G.addDefinedSymbol(FuncBlock, 4, "_f", 4, Linkage::Weak,
122122
Scope::Default, true, false);
123123

@@ -144,8 +144,8 @@ TEST_F(ObjectLinkingLayerTest, ClaimLateDefinedWeakSymbols) {
144144
SubtargetFeatures(), getGenericEdgeKindName);
145145

146146
auto &DataSec = G->createSection("__data", MemProt::Read | MemProt::Write);
147-
auto &DataBlock = G->createContentBlock(DataSec, BlockContent,
148-
orc::ExecutorAddr(0x1000), 8, 0);
147+
auto &DataBlock =
148+
G->createContentBlock(DataSec, BlockContent, ExecutorAddr(0x1000), 8, 0);
149149
G->addDefinedSymbol(DataBlock, 4, "_anchor", 4, Linkage::Weak, Scope::Default,
150150
false, true);
151151

@@ -197,8 +197,8 @@ TEST_F(ObjectLinkingLayerTest, HandleErrorDuringPostAllocationPass) {
197197
SubtargetFeatures(), getGenericEdgeKindName);
198198

199199
auto &DataSec = G->createSection("__data", MemProt::Read | MemProt::Write);
200-
auto &DataBlock = G->createContentBlock(DataSec, BlockContent,
201-
orc::ExecutorAddr(0x1000), 8, 0);
200+
auto &DataBlock =
201+
G->createContentBlock(DataSec, BlockContent, ExecutorAddr(0x1000), 8, 0);
202202
G->addDefinedSymbol(DataBlock, 4, "_anchor", 4, Linkage::Weak, Scope::Default,
203203
false, true);
204204

@@ -252,7 +252,7 @@ TEST_F(ObjectLinkingLayerTest, AddAndRemovePlugins) {
252252

253253
auto &DataSec = G1->createSection("__data", MemProt::Read | MemProt::Write);
254254
auto &DataBlock = G1->createContentBlock(DataSec, BlockContent,
255-
orc::ExecutorAddr(0x1000), 8, 0);
255+
ExecutorAddr(0x1000), 8, 0);
256256
G1->addDefinedSymbol(DataBlock, 4, "_anchor1", 4, Linkage::Weak,
257257
Scope::Default, false, true);
258258

@@ -270,7 +270,7 @@ TEST_F(ObjectLinkingLayerTest, AddAndRemovePlugins) {
270270

271271
auto &DataSec = G2->createSection("__data", MemProt::Read | MemProt::Write);
272272
auto &DataBlock = G2->createContentBlock(DataSec, BlockContent,
273-
orc::ExecutorAddr(0x1000), 8, 0);
273+
ExecutorAddr(0x1000), 8, 0);
274274
G2->addDefinedSymbol(DataBlock, 4, "_anchor2", 4, Linkage::Weak,
275275
Scope::Default, false, true);
276276

‎llvm/unittests/ExecutionEngine/Orc/SharedMemoryMapperTest.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ using namespace llvm::orc::rt_bootstrap;
2121
#if (defined(LLVM_ON_UNIX) && !defined(__ANDROID__)) || defined(_WIN32)
2222

2323
// A basic function to be used as both initializer/deinitializer
24-
orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
25-
size_t ArgSize) {
24+
CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
2625
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
2726
ArgData, ArgSize,
2827
[](ExecutorAddr A) -> Error {

‎llvm/unittests/ExecutionEngine/Orc/SimpleExecutorMemoryManagerTest.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ using namespace llvm::orc::rt_bootstrap;
2020

2121
namespace {
2222

23-
orc::shared::CWrapperFunctionResult incrementWrapper(const char *ArgData,
24-
size_t ArgSize) {
23+
CWrapperFunctionResult incrementWrapper(const char *ArgData, size_t ArgSize) {
2524
return WrapperFunction<SPSError(SPSExecutorAddr)>::handle(
2625
ArgData, ArgSize,
2726
[](ExecutorAddr A) -> Error {

0 commit comments

Comments
 (0)