[llvm-branch-commits] [cfe-branch] r366556 - Merging r366511:
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Jul 19 02:55:33 PDT 2019
Author: hans
Date: Fri Jul 19 02:55:32 2019
New Revision: 366556
URL: http://llvm.org/viewvc/llvm-project?rev=366556&view=rev
Log:
Merging r366511:
------------------------------------------------------------------------
r366511 | lhames | 2019-07-19 00:47:18 +0200 (Fri, 19 Jul 2019) | 3 lines
Update the SimpleJIT class in the clang-interpreter example to use ORCv2.
This will remove the ORCv1 deprecation warnings.
------------------------------------------------------------------------
Modified:
cfe/branches/release_90/ (props changed)
cfe/branches/release_90/examples/clang-interpreter/main.cpp
Propchange: cfe/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 19 02:55:32 2019
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:366429,366480
+/cfe/trunk:366429,366480,366511
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_90/examples/clang-interpreter/main.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/examples/clang-interpreter/main.cpp?rev=366556&r1=366555&r2=366556&view=diff
==============================================================================
--- cfe/branches/release_90/examples/clang-interpreter/main.cpp (original)
+++ cfe/branches/release_90/examples/clang-interpreter/main.cpp Fri Jul 19 02:55:32 2019
@@ -18,6 +18,7 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
+#include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
#include "llvm/ExecutionEngine/SectionMemoryManager.h"
@@ -50,65 +51,69 @@ namespace orc {
class SimpleJIT {
private:
ExecutionSession ES;
- std::shared_ptr<SymbolResolver> Resolver;
std::unique_ptr<TargetMachine> TM;
const DataLayout DL;
- LegacyRTDyldObjectLinkingLayer ObjectLayer;
- LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
+ MangleAndInterner Mangle{ES, DL};
+ RTDyldObjectLinkingLayer ObjectLayer{ES, createMemMgr};
+ IRCompileLayer CompileLayer{ES, ObjectLayer, SimpleCompiler(*TM)};
-public:
- SimpleJIT()
- : Resolver(createLegacyLookupResolver(
- ES,
- [this](const std::string &Name) -> JITSymbol {
- if (auto Sym = CompileLayer.findSymbol(Name, false))
- return Sym;
- else if (auto Err = Sym.takeError())
- return std::move(Err);
- if (auto SymAddr =
- RTDyldMemoryManager::getSymbolAddressInProcess(Name))
- return JITSymbol(SymAddr, JITSymbolFlags::Exported);
- return nullptr;
- },
- [](Error Err) { cantFail(std::move(Err), "lookupFlags failed"); })),
- TM(EngineBuilder().selectTarget()), DL(TM->createDataLayout()),
- ObjectLayer(ES,
- [this](VModuleKey) {
- return LegacyRTDyldObjectLinkingLayer::Resources{
- std::make_shared<SectionMemoryManager>(), Resolver};
- }),
- CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {
+ static std::unique_ptr<SectionMemoryManager> createMemMgr() {
+ return llvm::make_unique<SectionMemoryManager>();
+ }
+
+ SimpleJIT(std::unique_ptr<TargetMachine> TM, DataLayout DL,
+ DynamicLibrarySearchGenerator ProcessSymbolsGenerator)
+ : TM(std::move(TM)), DL(std::move(DL)) {
llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
+ ES.getMainJITDylib().setGenerator(std::move(ProcessSymbolsGenerator));
}
- const TargetMachine &getTargetMachine() const { return *TM; }
+public:
+ static Expected<std::unique_ptr<SimpleJIT>> Create() {
+ auto JTMB = JITTargetMachineBuilder::detectHost();
+ if (!JTMB)
+ return JTMB.takeError();
+
+ auto TM = JTMB->createTargetMachine();
+ if (!TM)
+ return TM.takeError();
+
+ auto DL = (*TM)->createDataLayout();
+
+ auto ProcessSymbolsGenerator =
+ DynamicLibrarySearchGenerator::GetForCurrentProcess(
+ DL.getGlobalPrefix());
+
+ if (!ProcessSymbolsGenerator)
+ return ProcessSymbolsGenerator.takeError();
- VModuleKey addModule(std::unique_ptr<Module> M) {
- // Add the module to the JIT with a new VModuleKey.
- auto K = ES.allocateVModule();
- cantFail(CompileLayer.addModule(K, std::move(M)));
- return K;
+ return std::unique_ptr<SimpleJIT>(new SimpleJIT(
+ std::move(*TM), std::move(DL), std::move(*ProcessSymbolsGenerator)));
}
- JITSymbol findSymbol(const StringRef &Name) {
- std::string MangledName;
- raw_string_ostream MangledNameStream(MangledName);
- Mangler::getNameWithPrefix(MangledNameStream, Name, DL);
- return CompileLayer.findSymbol(MangledNameStream.str(), true);
+ const TargetMachine &getTargetMachine() const { return *TM; }
+
+ Error addModule(ThreadSafeModule M) {
+ return CompileLayer.add(ES.getMainJITDylib(), std::move(M));
}
- JITTargetAddress getSymbolAddress(const StringRef &Name) {
- return cantFail(findSymbol(Name).getAddress());
+ Expected<JITEvaluatedSymbol> findSymbol(const StringRef &Name) {
+ return ES.lookup({&ES.getMainJITDylib()}, Mangle(Name));
}
- void removeModule(VModuleKey K) {
- cantFail(CompileLayer.removeModule(K));
+ Expected<JITTargetAddress> getSymbolAddress(const StringRef &Name) {
+ auto Sym = findSymbol(Name);
+ if (!Sym)
+ return Sym.takeError();
+ return Sym->getAddress();
}
};
} // end namespace orc
} // end namespace llvm
+llvm::ExitOnError ExitOnErr;
+
int main(int argc, const char **argv) {
// This just needs to be some symbol in the binary; C++ doesn't
// allow taking the address of ::main however.
@@ -130,6 +135,8 @@ int main(int argc, const char **argv) {
T.setObjectFormat(llvm::Triple::ELF);
#endif
+ ExitOnErr.setBanner("clang interpreter");
+
Driver TheDriver(Path, T.str(), Diags);
TheDriver.setTitle("clang interpreter");
TheDriver.setCheckInputsExist(false);
@@ -204,14 +211,16 @@ int main(int argc, const char **argv) {
llvm::InitializeNativeTargetAsmPrinter();
int Res = 255;
+ std::unique_ptr<llvm::LLVMContext> Ctx(Act->takeLLVMContext());
std::unique_ptr<llvm::Module> Module = Act->takeModule();
if (Module) {
- llvm::orc::SimpleJIT J;
- auto H = J.addModule(std::move(Module));
- auto Main = (int(*)(...))J.getSymbolAddress("main");
+ auto J = ExitOnErr(llvm::orc::SimpleJIT::Create());
+
+ ExitOnErr(J->addModule(
+ llvm::orc::ThreadSafeModule(std::move(Module), std::move(Ctx))));
+ auto Main = (int (*)(...))ExitOnErr(J->getSymbolAddress("main"));
Res = Main();
- J.removeModule(H);
}
// Shutdown.
More information about the llvm-branch-commits
mailing list