RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
By Arch Robison.

llvm-svn: 216159
This commit is contained in:
Elena Demikhovsky 2014-08-21 07:01:55 +00:00
parent 65775cc03d
commit 511b2e1f89
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
View File

@ -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.

5
tools/llvm-jitlistener/llvm-jitlistener.cpp
View File

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

2
unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h
View File

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