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

PR11143: Save the old diagnostic handler and call it when munging diagnostics for #line directives.

Browse Source 
This reenables proper inline asm diagnostics in clang

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142132 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2011-10-16 10:48:29 +00:00
parent c32a8c9073
commit 04a0426cc2
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Support/SourceMgr.h
View File

@@ -82,6 +82,9 @@ public:
DiagContext = Ctx; DiagContext = Ctx;
} }
DiagHandlerTy getDiagHandler() const { return DiagHandler; }
void *getDiagContext() const { return DiagContext; }
const SrcBuffer &getBufferInfo(unsigned i) const { const SrcBuffer &getBufferInfo(unsigned i) const {
assert(i < Buffers.size() && "Invalid Buffer ID!"); assert(i < Buffers.size() && "Invalid Buffer ID!");
return Buffers[i]; return Buffers[i];

18
lib/MC/MCParser/AsmParser.cpp
View File

@@ -87,6 +87,8 @@ private:
MCStreamer &Out; MCStreamer &Out;
const MCAsmInfo &MAI; const MCAsmInfo &MAI;
SourceMgr &SrcMgr; SourceMgr &SrcMgr;
SourceMgr::DiagHandlerTy SavedDiagHandler;
void *SavedDiagContext;
MCAsmParserExtension *GenericParser; MCAsmParserExtension *GenericParser;
MCAsmParserExtension *PlatformParser; MCAsmParserExtension *PlatformParser;
@@ -353,6 +355,10 @@ AsmParser::AsmParser(SourceMgr &_SM, MCContext &_Ctx,
: Lexer(_MAI), Ctx(_Ctx), Out(_Out), MAI(_MAI), SrcMgr(_SM), : Lexer(_MAI), Ctx(_Ctx), Out(_Out), MAI(_MAI), SrcMgr(_SM),
GenericParser(new GenericAsmParser), PlatformParser(0), GenericParser(new GenericAsmParser), PlatformParser(0),
CurBuffer(0), MacrosEnabled(true), CppHashLineNumber(0) { CurBuffer(0), MacrosEnabled(true), CppHashLineNumber(0) {
// Save the old handler.
SavedDiagHandler = SrcMgr.getDiagHandler();
SavedDiagContext = SrcMgr.getDiagContext();
// Set our own handler which calls the saved handler.
SrcMgr.setDiagHandler(DiagHandler, this); SrcMgr.setDiagHandler(DiagHandler, this);
Lexer.setBuffer(SrcMgr.getMemoryBuffer(CurBuffer)); Lexer.setBuffer(SrcMgr.getMemoryBuffer(CurBuffer));
@@ -1276,7 +1282,7 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
// Like SourceMgr::PrintMessage() we need to print the include stack if any // Like SourceMgr::PrintMessage() we need to print the include stack if any
// before printing the message. // before printing the message.
int DiagCurBuffer = DiagSrcMgr.FindBufferContainingLoc(DiagLoc); int DiagCurBuffer = DiagSrcMgr.FindBufferContainingLoc(DiagLoc);
if (DiagCurBuffer > 0) { if (!Parser->SavedDiagHandler && DiagCurBuffer > 0) {
SMLoc ParentIncludeLoc = DiagSrcMgr.getParentIncludeLoc(DiagCurBuffer); SMLoc ParentIncludeLoc = DiagSrcMgr.getParentIncludeLoc(DiagCurBuffer);
DiagSrcMgr.PrintIncludeStack(ParentIncludeLoc, OS); DiagSrcMgr.PrintIncludeStack(ParentIncludeLoc, OS);
} }
@@ -1287,7 +1293,10 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
if (!Parser->CppHashLineNumber || if (!Parser->CppHashLineNumber ||
&DiagSrcMgr != &Parser->SrcMgr || &DiagSrcMgr != &Parser->SrcMgr ||
DiagBuf != CppHashBuf) { DiagBuf != CppHashBuf) {
Diag.print(0, OS); if (Parser->SavedDiagHandler)
Parser->SavedDiagHandler(Diag, Parser->SavedDiagContext);
else
Diag.print(0, OS);
return; return;
} }
@@ -1307,7 +1316,10 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) {
Diag.getKind(), Diag.getMessage(), Diag.getKind(), Diag.getMessage(),
Diag.getLineContents(), Diag.getRanges()); Diag.getLineContents(), Diag.getRanges());
NewDiag.print(0, OS); if (Parser->SavedDiagHandler)
Parser->SavedDiagHandler(NewDiag, Parser->SavedDiagContext);
else
NewDiag.print(0, OS);
} }
bool AsmParser::expandMacro(SmallString<256> &Buf, StringRef Body, bool AsmParser::expandMacro(SmallString<256> &Buf, StringRef Body,