6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-27 02:31:09 +00:00
Code Issues Projects Releases Wiki Activity

errorstr can be null, don't unconditionally set it. Only report that

Browse Source 
"the jit has not been linked in" if the interpreter failed.

This fixes a unit test failure.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82601 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-09-23 02:03:49 +00:00
parent fbd39762e9
commit c72efbeb42
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ExecutionEngine/ExecutionEngine.cpp
View File

@ -429,7 +429,8 @@ ExecutionEngine *EngineBuilder::create() {
if (WhichEngine & EngineKind::JIT) if (WhichEngine & EngineKind::JIT)
WhichEngine = EngineKind::JIT; WhichEngine = EngineKind::JIT;
else { else {
*ErrorStr = "Cannot create an interpreter with a memory manager."; if (ErrorStr)
*ErrorStr = "Cannot create an interpreter with a memory manager.";
return 0; return 0;
} }
} }
@ -442,9 +443,6 @@ ExecutionEngine *EngineBuilder::create() {
ExecutionEngine::JITCtor(MP, ErrorStr, JMM, OptLevel, ExecutionEngine::JITCtor(MP, ErrorStr, JMM, OptLevel,
AllocateGVsWithCode); AllocateGVsWithCode);
if (EE) return EE; if (EE) return EE;
} else {
*ErrorStr = "JIT has not been linked in.";
return 0;
} }
} }
@ -453,10 +451,15 @@ ExecutionEngine *EngineBuilder::create() {
if (WhichEngine & EngineKind::Interpreter) { if (WhichEngine & EngineKind::Interpreter) {
if (ExecutionEngine::InterpCtor) if (ExecutionEngine::InterpCtor)
return ExecutionEngine::InterpCtor(MP, ErrorStr); return ExecutionEngine::InterpCtor(MP, ErrorStr);
*ErrorStr = "Interpreter has not been linked in."; if (ErrorStr)
*ErrorStr = "Interpreter has not been linked in.";
return 0; return 0;
} }
if ((WhichEngine & EngineKind::JIT) && ExecutionEngine::JITCtor == 0) {
if (ErrorStr)
*ErrorStr = "JIT has not been linked in.";
}
return 0; return 0;
} }