summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2018-10-23 23:01:39 +0000
committerLang Hames <lhames@gmail.com>2018-10-23 23:01:39 +0000
commit23cb2e7f7705eea783a8202afe27623eb4e0108e (patch)
tree6f414ab4059f0d452fa568b8e3f992884564d546 /llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
parent7c6344a64f82b6e13ed948ce22f73c4c150f8a4f (diff)
downloadbcm5719-llvm-23cb2e7f7705eea783a8202afe27623eb4e0108e.tar.gz
bcm5719-llvm-23cb2e7f7705eea783a8202afe27623eb4e0108e.zip
[ORC] Re-apply r345077 with fixes to remove ambiguity in lookup calls.
llvm-svn: 345098
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp')
-rw-r--r--llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
index 21a604f71ca..d9ff07efbe9 100644
--- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
@@ -130,8 +130,8 @@ Error CtorDtorRunner::run() {
auto &ES = JD.getExecutionSession();
if (auto CtorDtorMap =
- ES.lookup({&JD}, std::move(Names), NoDependenciesToRegister, true,
- nullptr, true)) {
+ ES.lookup(JITDylibSearchList({{&JD, true}}), std::move(Names),
+ NoDependenciesToRegister, true)) {
for (auto &KV : CtorDtorsByPriority) {
for (auto &Name : KV.second) {
assert(CtorDtorMap->count(Name) && "No entry for Name");
OpenPOWER on IntegriCloud