Index: include/clang/Basic/DiagnosticCategories.td =================================================================== --- include/clang/Basic/DiagnosticCategories.td (revision 197507) +++ include/clang/Basic/DiagnosticCategories.td (working copy) @@ -8,3 +8,4 @@ //===----------------------------------------------------------------------===// class CatInlineAsm : DiagCategory<"Inline Assembly Issue">; +class CatBackend : DiagCategory<"Backend Issue">; Index: include/clang/Basic/DiagnosticFrontendKinds.td =================================================================== --- include/clang/Basic/DiagnosticFrontendKinds.td (revision 197507) +++ include/clang/Basic/DiagnosticFrontendKinds.td (working copy) @@ -16,11 +16,19 @@ // Error generated by the backend. def err_fe_inline_asm : Error<"%0">, CatInlineAsm; +def warn_fe_inline_asm : Warning<"%0">, CatInlineAsm, InGroup; +def note_fe_inline_asm : Note<"%0">, CatInlineAsm; def note_fe_inline_asm_here : Note<"instantiated into assembly here">; def err_fe_cannot_link_module : Error<"cannot link module '%0': %1">, DefaultFatal; +def warn_fe_backend_stack_size: Warning<"stack size exceeded (%0) in %1">, CatBackend, InGroup; +def err_fe_backend_stack_size: Error<"%0">, CatBackend; +def note_fe_backend_stack_size: Note<"%0">, CatBackend; +def warn_fe_backend_plugin: Warning<"%0">, CatBackend, InGroup; +def err_fe_backend_plugin: Error<"%0">, CatBackend; +def note_fe_backend_plugin: Note<"%0">, CatBackend; def err_fe_invalid_code_complete_file : Error< "cannot locate code-completion file %0">, DefaultFatal; Index: include/clang/Basic/DiagnosticGroups.td =================================================================== --- include/clang/Basic/DiagnosticGroups.td (revision 197507) +++ include/clang/Basic/DiagnosticGroups.td (working copy) @@ -619,3 +619,8 @@ // OpenMP warnings. def SourceUsesOpenMP : DiagGroup<"source-uses-openmp">; + +// Backend warnings. +def BackendInlineAsm : DiagGroup<"backend-inline-asm">; +def BackendStackSize : DiagGroup<"backend-stack-size">; +def BackendPlugin : DiagGroup<"backend-plugin">; Index: lib/CodeGen/CodeGenAction.cpp =================================================================== --- lib/CodeGen/CodeGenAction.cpp (revision 197507) +++ lib/CodeGen/CodeGenAction.cpp (working copy) @@ -21,6 +21,8 @@ #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/IR/DiagnosticInfo.h" +#include "llvm/IR/DiagnosticPrinter.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/IRReader/IRReader.h" @@ -158,10 +160,17 @@ void *OldContext = Ctx.getInlineAsmDiagnosticContext(); Ctx.setInlineAsmDiagnosticHandler(InlineAsmDiagHandler, this); + LLVMContext::DiagnosticHandlerTy OldDiagnosticHandler = + Ctx.getDiagnosticHandler(); + void *OldDiagnosticContext = Ctx.getDiagnosticContext(); + Ctx.setDiagnosticHandler(DiagnosticHandler, this); + EmitBackendOutput(Diags, CodeGenOpts, TargetOpts, LangOpts, TheModule.get(), Action, AsmOutStream); Ctx.setInlineAsmDiagnosticHandler(OldHandler, OldContext); + + Ctx.setDiagnosticHandler(OldDiagnosticHandler, OldDiagnosticContext); } virtual void HandleTagDeclDefinition(TagDecl *D) { @@ -202,8 +211,23 @@ ((BackendConsumer*)Context)->InlineAsmDiagHandler2(SM, Loc); } + static void DiagnosticHandler(const llvm::DiagnosticInfo &DI, void *Context) { + ((BackendConsumer *)Context) + ->DiagnosticHandler2(DI); + } + void InlineAsmDiagHandler2(const llvm::SMDiagnostic &, SourceLocation LocCookie); + + void DiagnosticHandler2(const llvm::DiagnosticInfo &DI); + /// \brief Specialized handler for InlineAsm diagnostic. + /// \return True if the diagnostic has been successfully reported, false + /// otherwise. + bool InlineAsmDiagHandler(const llvm::DiagnosticInfoInlineAsm &D); + /// \brief Specialized handler for StackSize diagnostic. + /// \return True if the diagnostic has been successfully reported, false + /// otherwise. + bool StackSizeDiagHandler(const llvm::DiagnosticInfoStackSize &D); }; void BackendConsumer::anchor() {} @@ -282,6 +306,94 @@ Diags.Report(Loc, diag::err_fe_inline_asm).AddString(Message); } +#define SeveritySwitch(Severity, GroupName, DiagID) \ + switch (Severity) { \ + case llvm::DS_Error: \ + DiagID = diag::err_fe_##GroupName; \ + break; \ + case llvm::DS_Warning: \ + DiagID = diag::warn_fe_##GroupName; \ + break; \ + case llvm::DS_Note: \ + DiagID = diag::note_fe_##GroupName; \ + break; \ +} + + +bool BackendConsumer::InlineAsmDiagHandler(const llvm::DiagnosticInfoInlineAsm &D) { + unsigned DiagID; + SeveritySwitch(D.getSeverity(), inline_asm, DiagID); + StringRef Message = D.getMsgStr().str(); + + // If this problem has clang-level source location information, report the + // issue as being a prbolem in the source with a note showing the instantiated + // code. + SourceLocation LocCookie = + SourceLocation::getFromRawEncoding(D.getLocCookie()); + if (LocCookie.isValid()) + Diags.Report(LocCookie, DiagID).AddString(Message); + else { + // Otherwise, report the backend diagnostic as occurring in the generated + // .s file. + // If Loc is invalid, we still need to report the diagnostic, it just gets + // no location info. + FullSourceLoc Loc; + Diags.Report(Loc, DiagID).AddString(Message); + } + // We handled all the possible severities. + return true; +} + +bool BackendConsumer::StackSizeDiagHandler(const llvm::DiagnosticInfoStackSize &D) { + if (D.getSeverity() != llvm::DS_Warning) + // For now, the only support we have for StackSize diagnostic is warning. + // We do not know how to format other severities. + return false; + + // FIXME: We should demangle the function name. + // FIXME: Is there a way to get a location for that function? + FullSourceLoc Loc; + Diags.Report(Loc, diag::warn_fe_backend_stack_size) << D.getStackSize() + << D.getFunction().getName(); + return true; +} + + +/// DiagnosticHandler2 - This function is invoked when the backend needs +/// to report something to the user. +/// The \p DI interface provides two basic information: +/// getKind() helps to determines what it is reporting and +/// getSeverity() decribes how bad this is. +void BackendConsumer::DiagnosticHandler2(const DiagnosticInfo &DI) { + FullSourceLoc Loc; + unsigned DiagID = diag::err_fe_inline_asm; + llvm::DiagnosticSeverity Severity = DI.getSeverity(); + // Get the diagnostic ID based. + switch (DI.getKind()) { + case llvm::DK_InlineAsm: + if (InlineAsmDiagHandler(cast(DI))) + return; + SeveritySwitch(Severity, inline_asm, DiagID); + break; + case llvm::DK_StackSize: + if (StackSizeDiagHandler(cast(DI))) + return; + SeveritySwitch(Severity, backend_stack_size, DiagID); + break; + default: + // Plugin IDs are not bound to any value as they are set dynamically. + SeveritySwitch(Severity, backend_plugin, DiagID); + break; + } + std::string MsgStorage; + raw_string_ostream Stream(MsgStorage); + DiagnosticPrinterRawOStream DP(Stream); + DI.print(DP); + Stream.flush(); + + // Report the backend message using the usual diagnostic mechanism. + Diags.Report(Loc, DiagID).AddString(MsgStorage); +} // CodeGenAction::CodeGenAction(unsigned _Act, LLVMContext *_VMContext)