Skip to content

Commit ec6d621

Browse files
committed
Remove a top-level using-directive from EPCDebugObjectRegistrar.h
The directive pollutes the namespace of all files which include the header. Use alternate ways to reference the namespace constituents instead.
1 parent 3631b90 commit ec6d621

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <memory>
2424
#include <vector>
2525

26-
using namespace llvm::orc::shared;
27-
2826
namespace llvm {
2927
namespace orc {
3028

llvm/lib/ExecutionEngine/Orc/DebuggerSupportPlugin.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,11 @@ class MachODebugObjectSynthesizer : public MachODebugObjectSynthesizerBase {
349349
}
350350

351351
SectionRange R(MachOContainerBlock->getSection());
352-
G.allocActions().push_back({cantFail(shared::WrapperFunctionCall::Create<
353-
SPSArgList<SPSExecutorAddrRange>>(
354-
RegisterActionAddr, R.getRange())),
355-
{}});
352+
G.allocActions().push_back(
353+
{cantFail(shared::WrapperFunctionCall::Create<
354+
shared::SPSArgList<shared::SPSExecutorAddrRange>>(
355+
RegisterActionAddr, R.getRange())),
356+
{}});
356357
return Error::success();
357358
}
358359

llvm/lib/ExecutionEngine/Orc/EPCDebugObjectRegistrar.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ createJITLoaderGDBRegistrar(ExecutionSession &ES) {
4545

4646
Error EPCDebugObjectRegistrar::registerDebugObject(
4747
ExecutorAddrRange TargetMem) {
48-
return ES.callSPSWrapper<void(SPSExecutorAddrRange)>(RegisterFn, TargetMem);
48+
return ES.callSPSWrapper<void(shared::SPSExecutorAddrRange)>(RegisterFn,
49+
TargetMem);
4950
}
5051

5152
} // namespace orc

llvm/tools/llvm-jitlink/llvm-jitlink.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1908,8 +1908,9 @@ static Expected<int> runWithRuntime(Session &S, ExecutorAddr EntryPointAddr) {
19081908
if (TT.getObjectFormat() == Triple::MachO &&
19091909
DemangledEntryPoint.front() == '_')
19101910
DemangledEntryPoint = DemangledEntryPoint.drop_front();
1911+
using llvm::orc::shared::SPSString;
19111912
using SPSRunProgramSig =
1912-
int64_t(SPSString, SPSString, SPSSequence<SPSString>);
1913+
int64_t(SPSString, SPSString, shared::SPSSequence<SPSString>);
19131914
int64_t Result;
19141915
if (auto Err = S.ES.callSPSWrapper<SPSRunProgramSig>(
19151916
EntryPointAddr, Result, S.MainJD->getName(), DemangledEntryPoint,

0 commit comments

Comments
 (0)