diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h index d67371376d0..c2a0a3a7d20 100644 --- a/include/llvm/ExecutionEngine/ExecutionEngine.h +++ b/include/llvm/ExecutionEngine/ExecutionEngine.h @@ -56,8 +56,7 @@ public: virtual GenericValue run(Function *F, const std::vector &ArgValues) = 0; - static ExecutionEngine *create(ModuleProvider *MP, bool ForceInterpreter, - bool TraceMode); + static ExecutionEngine *create(ModuleProvider *MP, bool ForceInterpreter); void addGlobalMapping(const Function *F, void *Addr) { void *&CurVal = GlobalAddress[(const GlobalValue*)F]; diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index 38bd14ab726..dd647247c3f 100644 --- a/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/lib/ExecutionEngine/ExecutionEngine.cpp @@ -47,18 +47,17 @@ ExecutionEngine::~ExecutionEngine() { /// NULL is returned. /// ExecutionEngine *ExecutionEngine::create(ModuleProvider *MP, - bool ForceInterpreter, - bool TraceMode) { + bool ForceInterpreter) { ExecutionEngine *EE = 0; - // If there is nothing that is forcing us to use the interpreter, make a JIT. - if (!ForceInterpreter && !TraceMode) + // Unless the interpreter was explicitly selected, make a JIT. + if (!ForceInterpreter) EE = VM::create(MP); // If we can't make a JIT, make an interpreter instead. try { if (EE == 0) - EE = Interpreter::create(MP->materializeModule(), TraceMode); + EE = Interpreter::create(MP->materializeModule()); } catch (...) { EE = 0; }