diff options
| -rw-r--r-- | include/llvm/Support/SourceMgr.h | 10 | ||||
| -rw-r--r-- | lib/Support/SourceMgr.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/llvm/Support/SourceMgr.h b/include/llvm/Support/SourceMgr.h index caa67c03c5..3e66762ae3 100644 --- a/include/llvm/Support/SourceMgr.h +++ b/include/llvm/Support/SourceMgr.h @@ -35,7 +35,8 @@ public: /// DiagHandlerTy - Clients that want to handle their own diagnostics in a /// custom way can register a function pointer+context as a diagnostic /// handler. It gets called each time PrintMessage is invoked. - typedef void (*DiagHandlerTy)(const SMDiagnostic&, void *Context); + typedef void (*DiagHandlerTy)(const SMDiagnostic&, void *Context, + unsigned LocCookie); private: struct SrcBuffer { /// Buffer - The memory buffer for the file. @@ -59,6 +60,7 @@ private: DiagHandlerTy DiagHandler; void *DiagContext; + unsigned DiagLocCookie; SourceMgr(const SourceMgr&); // DO NOT IMPLEMENT void operator=(const SourceMgr&); // DO NOT IMPLEMENT @@ -71,10 +73,12 @@ public: } /// setDiagHandler - Specify a diagnostic handler to be invoked every time - /// PrintMessage is called. - void setDiagHandler(DiagHandlerTy DH, void *Ctx = 0) { + /// PrintMessage is called. Ctx and Cookie are passed into the handler when + /// it is invoked. + void setDiagHandler(DiagHandlerTy DH, void *Ctx = 0, unsigned Cookie = 0) { DiagHandler = DH; DiagContext = Ctx; + DiagLocCookie = Cookie; } const SrcBuffer &getBufferInfo(unsigned i) const { diff --git a/lib/Support/SourceMgr.cpp b/lib/Support/SourceMgr.cpp index fe2fbd96f7..4e7520c9d3 100644 --- a/lib/Support/SourceMgr.cpp +++ b/lib/Support/SourceMgr.cpp @@ -178,7 +178,8 @@ void SourceMgr::PrintMessage(SMLoc Loc, const std::string &Msg, const char *Type, bool ShowLine) const { // Report the message with the diagnostic handler if present. if (DiagHandler) { - DiagHandler(GetMessage(Loc, Msg, Type, ShowLine), DiagContext); + DiagHandler(GetMessage(Loc, Msg, Type, ShowLine), + DiagContext, DiagLocCookie); return; } |