mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 02:52:53 +02:00
6c25d206a9
rather than two callbacks. The asynchronous lookup API (which the synchronous lookup API wraps for convenience) used to take two callbacks: OnResolved (called once all requested symbols had an address assigned) and OnReady to be called once all requested symbols were safe to access). This patch updates the asynchronous lookup API to take a single 'OnComplete' callback and a required state (SymbolState) to determine when the callback should be made. This simplifies the common use case (where the client is interested in a specific state) and will generalize neatly as new states are introduced to track runtime initialization of symbols. Clients who were making use of both callbacks in a single query will now need to issue two queries (one for SymbolState::Resolved and another for SymbolState::Ready). Synchronous lookup API clients who were explicitly passing the WaitOnReady argument will now need neeed to pass a SymbolState instead (for 'WaitOnReady == true' use SymbolState::Ready, for 'WaitOnReady == false' use SymbolState::Resolved). Synchronous lookup API clients who were using default arugment values should see no change. llvm-svn: 362832
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
//===------- Legacy.cpp - Adapters for ExecutionEngine API interop --------===//
|
|
//
|
|
// 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/ExecutionEngine/Orc/Legacy.h"
|
|
|
|
namespace llvm {
|
|
namespace orc {
|
|
|
|
void SymbolResolver::anchor() {}
|
|
|
|
JITSymbolResolverAdapter::JITSymbolResolverAdapter(
|
|
ExecutionSession &ES, SymbolResolver &R, MaterializationResponsibility *MR)
|
|
: ES(ES), R(R), MR(MR) {}
|
|
|
|
void JITSymbolResolverAdapter::lookup(const LookupSet &Symbols,
|
|
OnResolvedFunction OnResolved) {
|
|
SymbolNameSet InternedSymbols;
|
|
for (auto &S : Symbols)
|
|
InternedSymbols.insert(ES.intern(S));
|
|
|
|
auto OnResolvedWithUnwrap = [OnResolved](Expected<SymbolMap> InternedResult) {
|
|
if (!InternedResult) {
|
|
OnResolved(InternedResult.takeError());
|
|
return;
|
|
}
|
|
|
|
LookupResult Result;
|
|
for (auto &KV : *InternedResult)
|
|
Result[*KV.first] = std::move(KV.second);
|
|
OnResolved(Result);
|
|
};
|
|
|
|
auto Q = std::make_shared<AsynchronousSymbolQuery>(
|
|
InternedSymbols, SymbolState::Resolved, OnResolvedWithUnwrap);
|
|
|
|
auto Unresolved = R.lookup(Q, InternedSymbols);
|
|
if (Unresolved.empty()) {
|
|
if (MR)
|
|
MR->addDependenciesForAll(Q->QueryRegistrations);
|
|
} else
|
|
ES.legacyFailQuery(*Q, make_error<SymbolsNotFound>(std::move(Unresolved)));
|
|
}
|
|
|
|
Expected<JITSymbolResolverAdapter::LookupSet>
|
|
JITSymbolResolverAdapter::getResponsibilitySet(const LookupSet &Symbols) {
|
|
SymbolNameSet InternedSymbols;
|
|
for (auto &S : Symbols)
|
|
InternedSymbols.insert(ES.intern(S));
|
|
|
|
auto InternedResult = R.getResponsibilitySet(InternedSymbols);
|
|
LookupSet Result;
|
|
for (auto &S : InternedResult) {
|
|
ResolvedStrings.insert(S);
|
|
Result.insert(*S);
|
|
}
|
|
|
|
return Result;
|
|
}
|
|
|
|
} // End namespace orc.
|
|
} // End namespace llvm.
|