summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2019-05-21 03:23:08 +0000
committerLang Hames <lhames@gmail.com>2019-05-21 03:23:08 +0000
commitf088e195cc2a75763149d57ce5dd1438ac206ca3 (patch)
treee683b9760a246ae2acde5a84c04ccd0c9700784e
parentc6f363f578fbd61cb740020d2dc0d98ea14c8306 (diff)
downloadbcm5719-llvm-f088e195cc2a75763149d57ce5dd1438ac206ca3.tar.gz
bcm5719-llvm-f088e195cc2a75763149d57ce5dd1438ac206ca3.zip
[ORC] Assert that JITDylibs have unique names.
Patch by Praveen Velliengiri. Thanks Praveen! Differential Revision: https://reviews.llvm.org/D62139 llvm-svn: 361215
-rw-r--r--llvm/include/llvm/ExecutionEngine/Orc/Core.h4
-rw-r--r--llvm/lib/ExecutionEngine/Orc/Core.cpp10
2 files changed, 14 insertions, 0 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Core.h b/llvm/include/llvm/ExecutionEngine/Orc/Core.h
index 57144118932..58bd957500c 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Core.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Core.h
@@ -726,6 +726,10 @@ public:
/// the ExecutionSession.
JITDylib &getMainJITDylib();
+ /// Return a pointer to the "name" JITDylib.
+ /// Ownership of JITDylib remains within Execution Session
+ JITDylib *getJITDylibByName(StringRef Name);
+
/// Add a new JITDylib to this ExecutionSession.
JITDylib &createJITDylib(std::string Name,
bool AddToMainDylibSearchOrder = true);
diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp
index bbc5a3e8dab..947355f17de 100644
--- a/llvm/lib/ExecutionEngine/Orc/Core.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp
@@ -1610,8 +1610,18 @@ JITDylib &ExecutionSession::getMainJITDylib() {
return runSessionLocked([this]() -> JITDylib & { return *JDs.front(); });
}
+JITDylib *ExecutionSession::getJITDylibByName(StringRef Name) {
+ return runSessionLocked([&, this]() -> JITDylib * {
+ for (auto &JD : JDs)
+ if (JD->getName() == Name)
+ return JD.get();
+ return nullptr;
+ });
+}
+
JITDylib &ExecutionSession::createJITDylib(std::string Name,
bool AddToMainDylibSearchOrder) {
+ assert(!getJITDylibByName(Name) && "JITDylib with that name already exists");
return runSessionLocked([&, this]() -> JITDylib & {
JDs.push_back(
std::unique_ptr<JITDylib>(new JITDylib(*this, std::move(Name))));
OpenPOWER on IntegriCloud