diff options
Diffstat (limited to 'llvm')
3 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp b/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp index 4e22a8b3ea0..29be7c74902 100644 --- a/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp +++ b/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp @@ -190,7 +190,7 @@ void IntelJITEventListener::NotifyFreeingMachineCode(void *FnStart) { void IntelJITEventListener::NotifyObjectEmitted(const ObjectImage &Obj) { // Get the address of the object image for use as a unique identifier const void* ObjData = Obj.getData().data(); - DIContext* Context = DIContext::getDWARFContext(Obj.getObjectFile()); + DIContext* Context = DIContext::getDWARFContext(*Obj.getObjectFile()); MethodAddressVector Functions; // Use symbol info to iterate functions in the object. diff --git a/llvm/tools/llvm-jitlistener/llvm-jitlistener.cpp b/llvm/tools/llvm-jitlistener/llvm-jitlistener.cpp index c159aa506d6..a6554698c17 100644 --- a/llvm/tools/llvm-jitlistener/llvm-jitlistener.cpp +++ b/llvm/tools/llvm-jitlistener/llvm-jitlistener.cpp @@ -113,7 +113,7 @@ protected: // Parse the bitcode... SMDiagnostic Err; - TheModule = ParseIRFile(IRFile, Err, Context); + std::unique_ptr<Module> TheModule(ParseIRFile(IRFile, Err, Context)); if (!TheModule) { errs() << Err.getMessage(); return; @@ -145,7 +145,7 @@ protected: // Compile the IR std::string Error; - TheJIT.reset(EngineBuilder(TheModule) + TheJIT.reset(EngineBuilder(std::move(TheModule)) .setEngineKind(EngineKind::JIT) .setErrorStr(&Error) .setJITMemoryManager(MemMgr) @@ -160,7 +160,6 @@ protected: } LLVMContext Context; // Global ownership - Module *TheModule; // Owned by ExecutionEngine. JITMemoryManager *JMM; // Owned by ExecutionEngine. std::unique_ptr<ExecutionEngine> TheJIT; diff --git a/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h index 61220f545f9..2af688c777e 100644 --- a/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h +++ b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h @@ -66,7 +66,7 @@ public: JITEventListenerTestBase(WrapperT* w) : MockWrapper(w) , M(new llvm::Module("module", llvm::getGlobalContext())) - , EE(llvm::EngineBuilder(M) + , EE(llvm::EngineBuilder(std::unique_ptr<llvm::Module>(M)) .setEngineKind(llvm::EngineKind::JIT) .setOptLevel(llvm::CodeGenOpt::None) .create()) |
