diff options
author | Quentin Colombet <qcolombet@apple.com> | 2014-02-22 00:34:11 +0000 |
---|---|---|
committer | Quentin Colombet <qcolombet@apple.com> | 2014-02-22 00:34:11 +0000 |
commit | 341149ae85564f1c101f7bf5a6f93b9b5bd58583 (patch) | |
tree | cc43641e4afe220ef457f88ddc247e41500f6010 /lib/IR/LLVMContext.cpp | |
parent | 8048c44580056994eb0f2804e2914badc8fbef43 (diff) | |
download | llvm-341149ae85564f1c101f7bf5a6f93b9b5bd58583.tar.gz llvm-341149ae85564f1c101f7bf5a6f93b9b5bd58583.tar.bz2 llvm-341149ae85564f1c101f7bf5a6f93b9b5bd58583.tar.xz |
Switch the LLVM error reporting on the new diagnostic system.
The LLVM diagnostic are now wired-up in clang (since r200931),
thus the user experience will not be impacted by this change
anymore.
Related to <rdar://problem/15886697>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201915 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR/LLVMContext.cpp')
-rw-r--r-- | lib/IR/LLVMContext.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/lib/IR/LLVMContext.cpp b/lib/IR/LLVMContext.cpp index bae83dd301..d9d6de1544 100644 --- a/lib/IR/LLVMContext.cpp +++ b/lib/IR/LLVMContext.cpp @@ -115,17 +115,12 @@ void *LLVMContext::getDiagnosticContext() const { } void LLVMContext::emitError(const Twine &ErrorStr) { - emitError(0U, ErrorStr); + diagnose(DiagnosticInfoInlineAsm(ErrorStr)); } void LLVMContext::emitError(const Instruction *I, const Twine &ErrorStr) { - unsigned LocCookie = 0; - if (const MDNode *SrcLoc = I->getMetadata("srcloc")) { - if (SrcLoc->getNumOperands() != 0) - if (const ConstantInt *CI = dyn_cast<ConstantInt>(SrcLoc->getOperand(0))) - LocCookie = CI->getZExtValue(); - } - return emitError(LocCookie, ErrorStr); + assert (I && "Invalid instruction"); + diagnose(DiagnosticInfoInlineAsm(*I, ErrorStr)); } void LLVMContext::diagnose(const DiagnosticInfo &DI) { @@ -154,16 +149,7 @@ void LLVMContext::diagnose(const DiagnosticInfo &DI) { } void LLVMContext::emitError(unsigned LocCookie, const Twine &ErrorStr) { - // If there is no error handler installed, just print the error and exit. - if (pImpl->InlineAsmDiagHandler == 0) { - errs() << "error: " << ErrorStr << "\n"; - exit(1); - } - - // If we do have an error handler, we can report the error and keep going. - SMDiagnostic Diag("", SourceMgr::DK_Error, ErrorStr.str()); - - pImpl->InlineAsmDiagHandler(Diag, pImpl->InlineAsmDiagContext, LocCookie); + diagnose(DiagnosticInfoInlineAsm(LocCookie, ErrorStr)); } //===----------------------------------------------------------------------===// |