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

Fixed a problem where inline assembly errors caused 

LLDB to crash.

<rdar://problem/13497915>

llvm-svn: 178115
This commit is contained in:
Sean Callanan 2013-03-27 03:09:55 +00:00
parent a1b72d0f6a
commit 44bc657efe
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lldb/source/Expression/IRExecutionUnit.cpp
View File

@ -11,7 +11,9 @@
// C++ Includes
// Other libraries and framework includes
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/SourceMgr.h"
// Project includes
#include "lldb/Core/DataBufferHeap.h"
#include "lldb/Core/DataExtractor.h"
@ -253,6 +255,17 @@ IRExecutionUnit::DisassembleFunction (Stream &stream,
return ret;
}
static void ReportInlineAsmError(const llvm::SMDiagnostic &diagnostic, void *Context, unsigned LocCookie)
{
Error *err = static_cast<Error*>(Context);
if (err && err->Success())
{
err->SetErrorToGenericError();
err->SetErrorStringWithFormat("Inline assembly error: %s", diagnostic.getMessage().str().c_str());
}
}
void
IRExecutionUnit::GetRunnableInfo(Error &error,
lldb::addr_t &func_addr,
@ -325,6 +338,8 @@ IRExecutionUnit::GetRunnableInfo(Error &error,
codeModel = llvm::CodeModel::Small;
}
m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError, &error);
llvm::EngineBuilder builder(m_module_ap.get());
builder.setEngineKind(llvm::EngineKind::JIT)
@ -367,7 +382,11 @@ IRExecutionUnit::GetRunnableInfo(Error &error,
void *fun_ptr = m_execution_engine_ap->getPointerToFunction(function);
// Errors usually cause failures in the JIT, but if we're lucky we get here.
if (!error.Success())
{
// We got an error through our callback!
return;
}
if (!function)
{