Author: gbreynoo Date: 2020-03-26T10:26:59Z New Revision: a945037e8fd0c30e250a62211469eea6765a36ae
URL: https://github.com/llvm/llvm-project/commit/a945037e8fd0c30e250a62211469eea6765a36ae DIFF: https://github.com/llvm/llvm-project/commit/a945037e8fd0c30e250a62211469eea6765a36ae.diff LOG: Tools emit the bug report URL on crash When Clang crashes a useful message is output: "PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script." A similar message is now output for all tools. Differential Revision: https://reviews.llvm.org/D74324 Added: Modified: clang/lib/Driver/Driver.cpp clang/tools/driver/driver.cpp llvm/include/llvm/Support/PrettyStackTrace.h llvm/lib/Support/PrettyStackTrace.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 37761893f137..e3b7793ca266 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1267,10 +1267,6 @@ void Driver::generateCompilationDiagnostics( // Print the version of the compiler. PrintVersion(C, llvm::errs()); - Diag(clang::diag::note_drv_command_failed_diag_msg) - << "PLEASE submit a bug report to " BUG_REPORT_URL " and include the " - "crash backtrace, preprocessed source, and associated run script."; - // Suppress driver output and emit preprocessor output to temp file. Mode = CPPMode; CCGenDiagnostics = true; diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index c59752178b66..f037a821f9d7 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -38,6 +38,7 @@ #include "llvm/Support/Host.h" #include "llvm/Support/InitLLVM.h" #include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Process.h" #include "llvm/Support/Program.h" #include "llvm/Support/Regex.h" @@ -342,6 +343,9 @@ static int ExecuteCC1Tool(SmallVectorImpl<const char *> &ArgV) { int main(int argc_, const char **argv_) { noteBottomOfStack(); llvm::InitLLVM X(argc_, argv_); + llvm::setBugReportMsg("PLEASE submit a bug report to " BUG_REPORT_URL + " and include the crash backtrace, preprocessed " + "source, and associated run script.\n"); SmallVector<const char *, 256> argv(argv_, argv_ + argc_); if (llvm::sys::Process::FixupStandardFileDescriptors()) diff --git a/llvm/include/llvm/Support/PrettyStackTrace.h b/llvm/include/llvm/Support/PrettyStackTrace.h index 6eb070b2297e..32975f3c5a35 100644 --- a/llvm/include/llvm/Support/PrettyStackTrace.h +++ b/llvm/include/llvm/Support/PrettyStackTrace.h @@ -37,6 +37,10 @@ namespace llvm { /// \see PrettyStackTraceEntry void EnablePrettyStackTraceOnSigInfoForThisThread(bool ShouldEnable = true); + /// Replaces the generic bug report message that is output upon + /// a crash. + void setBugReportMsg(const char *Msg); + /// PrettyStackTraceEntry - This class is used to represent a frame of the /// "pretty" stack trace that is dumped when a program crashes. You can define /// subclasses of this and declare them on the program stack: when they are diff --git a/llvm/lib/Support/PrettyStackTrace.cpp b/llvm/lib/Support/PrettyStackTrace.cpp index 30a12f65966a..e1b834fe1347 100644 --- a/llvm/lib/Support/PrettyStackTrace.cpp +++ b/llvm/lib/Support/PrettyStackTrace.cpp @@ -142,9 +142,17 @@ using CrashHandlerStringStorage = static CrashHandlerStringStorage crashHandlerStringStorage; #endif +static const char *BugReportMsg = + "PLEASE submit a bug report to " BUG_REPORT_URL + " and include the crash backtrace.\n"; + +void llvm::setBugReportMsg(const char *Msg) { BugReportMsg = Msg; } + /// This callback is run if a fatal signal is delivered to the process, it /// prints the pretty stack trace. static void CrashHandler(void *) { + errs() << BugReportMsg ; + #ifndef __APPLE__ // On non-apple systems, just emit the crash stack trace to stderr. PrintCurStackTrace(errs()); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits