IntelJITEventListener updates to fix breaks by recent changes to EngineBuilder and DIContext

[ArchDRobison]

Summary

Revisions r214433 and r215967 changed two interfaces slightly, in a way that keeps IntelJITEventListener from compiling. The patch fixes these problems.

[• rafael]

tools/llvm-jitlistener/llvm-jitlistener.cpp

148

This looks odd.

It seems TheModule is only used in InitEE. Could you make it a local variable:

std::unique_ptr<Module> TheModule( ParseIRFile(IRFile, Err, Context));

and std::move it here?

[ArchDRobison]

Updated per Rafael Ávila de Espíndola's comments to use std::unique_ptr more naturally.

[• rafael]

LGTM with the unit test updated too.

[Eugene.Zelenko]

Committed in rL216159.

lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp

 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.

tools/llvm-jitlistener/llvm-jitlistener.cpp

 
     // 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;

 
     // Compile the IR
     std::string Error;
-    TheJIT.reset(EngineBuilder(TheModule)
+    TheJIT.reset(EngineBuilder(std::move(TheModule))
       .setEngineKind(EngineKind::JIT)
       .setErrorStr(&Error)
       .setJITMemoryManager(MemMgr)

   }
 
   LLVMContext Context; // Global ownership
-  Module *TheModule; // Owned by ExecutionEngine.
   JITMemoryManager *JMM; // Owned by ExecutionEngine.
   std::unique_ptr<ExecutionEngine> TheJIT;
 

unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h

   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())