maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MCJIT: Tidy up the constructor. 

The MCJIT doesn't need or want a TargetJITInfo. That's vestigal from the old
JIT, so just remove it.

rdar://12119347

llvm-svn: 162280
This commit is contained in:
Jim Grosbach 2012-08-21 15:42:49 +00:00
parent 68d9c9da40
commit bea6753f4f
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/ExecutionEngine/ExecutionEngine.cpp
View File

@ -501,7 +501,8 @@ ExecutionEngine *EngineBuilder::create(TargetMachine *TM) {
return 0; return 0;
} }
if ((WhichEngine & EngineKind::JIT) && ExecutionEngine::JITCtor == 0) { if ((WhichEngine & EngineKind::JIT) && ExecutionEngine::JITCtor == 0 &&
ExecutionEngine::MCJITCtor == 0) {
if (ErrorStr) if (ErrorStr)
*ErrorStr = "JIT has not been linked in."; *ErrorStr = "JIT has not been linked in.";
} }

14
llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
View File

@ -44,18 +44,12 @@ ExecutionEngine *MCJIT::createJIT(Module *M,
// FIXME: Don't do this here. // FIXME: Don't do this here.
sys::DynamicLibrary::LoadLibraryPermanently(0, NULL); sys::DynamicLibrary::LoadLibraryPermanently(0, NULL);
// If the target supports JIT code generation, create the JIT. return new MCJIT(M, TM, new MCJITMemoryManager(JMM), GVsWithCode);
if (TargetJITInfo *TJ = TM->getJITInfo())
return new MCJIT(M, TM, *TJ, new MCJITMemoryManager(JMM), GVsWithCode);
if (ErrorStr)
*ErrorStr = "target does not support JIT code generation";
return 0;
} }
MCJIT::MCJIT(Module *m, TargetMachine *tm, TargetJITInfo &tji, MCJIT::MCJIT(Module *m, TargetMachine *tm, RTDyldMemoryManager *MM,
RTDyldMemoryManager *MM, bool AllocateGVsWithCode) bool AllocateGVsWithCode)
: ExecutionEngine(m), TM(tm), Ctx(0), MemMgr(MM), Dyld(MM), : ExecutionEngine(m), TM(tm), Ctx(0), MemMgr(MM), Dyld(MM),
isCompiled(false), M(m), OS(Buffer) { isCompiled(false), M(m), OS(Buffer) {
setTargetData(TM->getTargetData()); setTargetData(TM->getTargetData());

4
llvm/lib/ExecutionEngine/MCJIT/MCJIT.h
View File

@ -23,8 +23,8 @@ namespace llvm {
// blah blah. Purely in get-it-up-and-limping mode for now. // blah blah. Purely in get-it-up-and-limping mode for now.
class MCJIT : public ExecutionEngine { class MCJIT : public ExecutionEngine {
MCJIT(Module *M, TargetMachine *tm, TargetJITInfo &tji, MCJIT(Module *M, TargetMachine *tm, RTDyldMemoryManager *MemMgr,
RTDyldMemoryManager *MemMgr, bool AllocateGVsWithCode); bool AllocateGVsWithCode);
TargetMachine *TM; TargetMachine *TM;
MCContext *Ctx; MCContext *Ctx;