Skip to content

Commit 8c4f038

Browse files
committed
Remove lookup implementation
1 parent 81fd920 commit 8c4f038

File tree

6 files changed

+0
-65
lines changed

6 files changed

+0
-65
lines changed

llvm/include/llvm/ExecutionEngine/Orc/EPCGenericDylibManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class EPCGenericDylibManager {
3434
struct SymbolAddrs {
3535
ExecutorAddr Instance;
3636
ExecutorAddr Open;
37-
ExecutorAddr Lookup;
3837
ExecutorAddr Resolve;
3938
};
4039

llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ namespace rt {
2525

2626
LLVM_ABI extern const char *SimpleExecutorDylibManagerInstanceName;
2727
LLVM_ABI extern const char *SimpleExecutorDylibManagerOpenWrapperName;
28-
LLVM_ABI extern const char *SimpleExecutorDylibManagerLookupWrapperName;
2928
LLVM_ABI extern const char *SimpleExecutorDylibManagerResolveWrapperName;
3029

3130
LLVM_ABI extern const char *SimpleExecutorMemoryManagerInstanceName;
@@ -67,11 +66,6 @@ using SPSSimpleExecutorDylibManagerOpenSignature =
6766
shared::SPSExpected<shared::SPSExecutorAddr>(shared::SPSExecutorAddr,
6867
shared::SPSString, uint64_t);
6968

70-
using SPSSimpleExecutorDylibManagerLookupSignature =
71-
shared::SPSExpected<shared::SPSSequence<shared::SPSExecutorSymbolDef>>(
72-
shared::SPSExecutorAddr, shared::SPSExecutorAddr,
73-
shared::SPSRemoteSymbolLookupSet);
74-
7569
using SPSSimpleExecutorDylibManagerResolveSignature = shared::SPSExpected<
7670
shared::SPSSequence<shared::SPSOptional<shared::SPSExecutorSymbolDef>>>(
7771
shared::SPSExecutorAddr, shared::SPSRemoteSymbolLookupSet);

llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ class LLVM_ABI SimpleExecutorDylibManager : public ExecutorBootstrapService {
4040
virtual ~SimpleExecutorDylibManager();
4141

4242
Expected<tpctypes::DylibHandle> open(const std::string &Path, uint64_t Mode);
43-
Expected<std::vector<ExecutorSymbolDef>>
44-
lookup(tpctypes::DylibHandle H, const RemoteSymbolLookupSet &L);
4543

4644
Error shutdown() override;
4745
void addBootstrapSymbols(StringMap<ExecutorAddr> &M) override;
@@ -52,9 +50,6 @@ class LLVM_ABI SimpleExecutorDylibManager : public ExecutorBootstrapService {
5250
static llvm::orc::shared::CWrapperFunctionResult
5351
openWrapper(const char *ArgData, size_t ArgSize);
5452

55-
static llvm::orc::shared::CWrapperFunctionResult
56-
lookupWrapper(const char *ArgData, size_t ArgSize);
57-
5853
static llvm::orc::shared::CWrapperFunctionResult
5954
resolveWrapper(const char *ArgData, size_t ArgSize);
6055

llvm/lib/ExecutionEngine/Orc/EPCGenericDylibManager.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ EPCGenericDylibManager::CreateWithDefaultBootstrapSymbols(
6666
if (auto Err = EPC.getBootstrapSymbols(
6767
{{SAs.Instance, rt::SimpleExecutorDylibManagerInstanceName},
6868
{SAs.Open, rt::SimpleExecutorDylibManagerOpenWrapperName},
69-
{SAs.Lookup, rt::SimpleExecutorDylibManagerLookupWrapperName},
7069
{SAs.Resolve, rt::SimpleExecutorDylibManagerResolveWrapperName}}))
7170
return std::move(Err);
7271
return EPCGenericDylibManager(EPC, std::move(SAs));

llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ const char *SimpleExecutorDylibManagerInstanceName =
1616
"__llvm_orc_SimpleExecutorDylibManager_Instance";
1717
const char *SimpleExecutorDylibManagerOpenWrapperName =
1818
"__llvm_orc_SimpleExecutorDylibManager_open_wrapper";
19-
const char *SimpleExecutorDylibManagerLookupWrapperName =
20-
"__llvm_orc_SimpleExecutorDylibManager_lookup_wrapper";
2119
const char *SimpleExecutorDylibManagerResolveWrapperName =
2220
"__llvm_orc_SimpleExecutorDylibManager_resolve_wrapper";
2321

llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.cpp

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -44,44 +44,6 @@ SimpleExecutorDylibManager::open(const std::string &Path, uint64_t Mode) {
4444
return ExecutorAddr::fromPtr(Resolvers.back().get());
4545
}
4646

47-
Expected<std::vector<ExecutorSymbolDef>>
48-
SimpleExecutorDylibManager::lookup(tpctypes::DylibHandle H,
49-
const RemoteSymbolLookupSet &L) {
50-
std::vector<ExecutorSymbolDef> Result;
51-
auto DL = sys::DynamicLibrary(H.toPtr<void *>());
52-
53-
for (const auto &E : L) {
54-
if (E.Name.empty()) {
55-
if (E.Required)
56-
return make_error<StringError>("Required address for empty symbol \"\"",
57-
inconvertibleErrorCode());
58-
else
59-
Result.push_back(ExecutorSymbolDef());
60-
} else {
61-
62-
const char *DemangledSymName = E.Name.c_str();
63-
#ifdef __APPLE__
64-
if (E.Name.front() != '_')
65-
return make_error<StringError>(Twine("MachO symbol \"") + E.Name +
66-
"\" missing leading '_'",
67-
inconvertibleErrorCode());
68-
++DemangledSymName;
69-
#endif
70-
71-
void *Addr = DL.getAddressOfSymbol(DemangledSymName);
72-
if (!Addr && E.Required)
73-
return make_error<StringError>(Twine("Missing definition for ") +
74-
DemangledSymName,
75-
inconvertibleErrorCode());
76-
77-
// FIXME: determine accurate JITSymbolFlags.
78-
Result.push_back({ExecutorAddr::fromPtr(Addr), JITSymbolFlags::Exported});
79-
}
80-
}
81-
82-
return Result;
83-
}
84-
8547
Error SimpleExecutorDylibManager::shutdown() {
8648

8749
DylibSet DS;
@@ -99,8 +61,6 @@ void SimpleExecutorDylibManager::addBootstrapSymbols(
9961
M[rt::SimpleExecutorDylibManagerInstanceName] = ExecutorAddr::fromPtr(this);
10062
M[rt::SimpleExecutorDylibManagerOpenWrapperName] =
10163
ExecutorAddr::fromPtr(&openWrapper);
102-
M[rt::SimpleExecutorDylibManagerLookupWrapperName] =
103-
ExecutorAddr::fromPtr(&lookupWrapper);
10464
M[rt::SimpleExecutorDylibManagerResolveWrapperName] =
10565
ExecutorAddr::fromPtr(&resolveWrapper);
10666
}
@@ -115,16 +75,6 @@ SimpleExecutorDylibManager::openWrapper(const char *ArgData, size_t ArgSize) {
11575
.release();
11676
}
11777

118-
llvm::orc::shared::CWrapperFunctionResult
119-
SimpleExecutorDylibManager::lookupWrapper(const char *ArgData, size_t ArgSize) {
120-
return shared::
121-
WrapperFunction<rt::SPSSimpleExecutorDylibManagerLookupSignature>::handle(
122-
ArgData, ArgSize,
123-
shared::makeMethodWrapperHandler(
124-
&SimpleExecutorDylibManager::lookup))
125-
.release();
126-
}
127-
12878
llvm::orc::shared::CWrapperFunctionResult
12979
SimpleExecutorDylibManager::resolveWrapper(const char *ArgData,
13080
size_t ArgSize) {

0 commit comments

Comments
 (0)