From 1426351c83b827db3ee5196ce87315baf3558a5a Mon Sep 17 00:00:00 2001
From: Sean Callanan <scallanan@apple.com>
Date: Sat, 9 Apr 2011 00:37:25 +0000
Subject: Redirected errors from the AsmParser to the proper error stream, in
 cases where the AsmParser is being invoked by EDDisassembler.  Before, they
 were being sent to errs() because no error handler was installed in the
 SourceMgr.

llvm-svn: 129177
---
 llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'llvm/lib/MC/MCDisassembler/EDDisassembler.cpp')

diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
index e36b3a4e..91c5284 100644
--- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -334,6 +334,15 @@ int EDDisassembler::printInst(std::string &str, MCInst &inst) {
   return 0;
 }
 
+static void diag_handler(const SMDiagnostic &diag,
+                         void *context)
+{
+  if (context) {
+    EDDisassembler *disassembler = static_cast<EDDisassembler*>(context);
+    diag.Print("", disassembler->ErrorStream);
+  }
+}
+
 int EDDisassembler::parseInst(SmallVectorImpl<MCParsedAsmOperand*> &operands,
                               SmallVectorImpl<AsmToken> &tokens,
                               const std::string &str) {
@@ -356,6 +365,7 @@ int EDDisassembler::parseInst(SmallVectorImpl<MCParsedAsmOperand*> &operands,
   SMLoc instLoc;
   
   SourceMgr sourceMgr;
+  sourceMgr.setDiagHandler(diag_handler, static_cast<void*>(this));
   sourceMgr.AddNewSourceBuffer(buf, SMLoc()); // ownership of buf handed over
   MCContext context(*AsmInfo, NULL);
   OwningPtr<MCStreamer> streamer(createNullStreamer(context));
-- 
cgit v1.1