diff options
author | Lang Hames <lhames@gmail.com> | 2018-08-17 21:18:18 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2018-08-17 21:18:18 +0000 |
commit | d5f56c5979d697f1c9eabf0bdfd882baac55f402 (patch) | |
tree | 429704c49ac5d2242df1cf08cae2ce572975add7 /llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | |
parent | 469f076356e864b438a96a17b4c265014277e982 (diff) | |
download | bcm5719-llvm-d5f56c5979d697f1c9eabf0bdfd882baac55f402.tar.gz bcm5719-llvm-d5f56c5979d697f1c9eabf0bdfd882baac55f402.zip |
[ORC] Rename VSO to JITDylib.
VSO was a little close to VDSO (an acronym on Linux for Virtual Dynamic Shared
Object) for comfort. It also risks giving the impression that instances of this
class could be shared between ExecutionSessions, which they can not.
JITDylib seems moderately less confusing, while still hinting at how this
class is intended to be used, i.e. as a JIT-compiled stand-in for a dynamic
library (code that would have been a dynamic library if you had wanted to
compile it ahead of time).
llvm-svn: 340084
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc/LLJIT.cpp')
-rw-r--r-- | llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp index 52ff4efe56b..12ec65a2050 100644 --- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp +++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp @@ -28,25 +28,25 @@ Error LLJIT::defineAbsolute(StringRef Name, JITEvaluatedSymbol Sym) { return Main.define(absoluteSymbols(std::move(Symbols))); } -Error LLJIT::addIRModule(VSO &V, std::unique_ptr<Module> M) { +Error LLJIT::addIRModule(JITDylib &JD, std::unique_ptr<Module> M) { assert(M && "Can not add null module"); if (auto Err = applyDataLayout(*M)) return Err; auto K = ES->allocateVModule(); - return CompileLayer.add(V, K, std::move(M)); + return CompileLayer.add(JD, K, std::move(M)); } -Expected<JITEvaluatedSymbol> LLJIT::lookupLinkerMangled(VSO &V, +Expected<JITEvaluatedSymbol> LLJIT::lookupLinkerMangled(JITDylib &JD, StringRef Name) { - return llvm::orc::lookup({&V}, ES->getSymbolStringPool().intern(Name)); + return llvm::orc::lookup({&JD}, ES->getSymbolStringPool().intern(Name)); } LLJIT::LLJIT(std::unique_ptr<ExecutionSession> ES, std::unique_ptr<TargetMachine> TM, DataLayout DL) - : ES(std::move(ES)), Main(this->ES->createVSO("main")), TM(std::move(TM)), - DL(std::move(DL)), + : ES(std::move(ES)), Main(this->ES->createJITDylib("main")), + TM(std::move(TM)), DL(std::move(DL)), ObjLinkingLayer(*this->ES, [this](VModuleKey K) { return getMemoryManager(K); }), CompileLayer(*this->ES, ObjLinkingLayer, SimpleCompiler(*this->TM)), @@ -106,7 +106,7 @@ LLLazyJIT::Create(std::unique_ptr<ExecutionSession> ES, std::move(CCMgr), std::move(ISMBuilder))); } -Error LLLazyJIT::addLazyIRModule(VSO &V, std::unique_ptr<Module> M) { +Error LLLazyJIT::addLazyIRModule(JITDylib &JD, std::unique_ptr<Module> M) { assert(M && "Can not add null module"); if (auto Err = applyDataLayout(*M)) @@ -117,7 +117,7 @@ Error LLLazyJIT::addLazyIRModule(VSO &V, std::unique_ptr<Module> M) { recordCtorDtors(*M); auto K = ES->allocateVModule(); - return CODLayer.add(V, K, std::move(M)); + return CODLayer.add(JD, K, std::move(M)); } LLLazyJIT::LLLazyJIT( |