public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/freport-bug-better-wording)] Improve wording for -freport-bug option. Date: Thu, 27 Jan 2022 10:24:19 +0000 (GMT) [thread overview] Message-ID: <20220127102419.5261F3947415@sourceware.org> (raw) https://gcc.gnu.org/g:52bb5a596781ddb7f993209ededae5e5df03d2cb commit 52bb5a596781ddb7f993209ededae5e5df03d2cb Author: Martin Liska <mliska@suse.cz> Date: Thu Jan 27 11:22:42 2022 +0100 Improve wording for -freport-bug option. gcc/ChangeLog: * diagnostic.cc (diagnostic_initialize): Initialize report_bug flag. (diagnostic_action_after_output): Explain that -freport-bug option can be used for pre-processed file creation. Make the message shorter. (error_recursion): Rename Internal to internal. * diagnostic.h (struct diagnostic_context): New field. * opts.cc (common_handle_option): Init the field here. Diff: --- gcc/diagnostic.cc | 20 +++++++++++--------- gcc/diagnostic.h | 3 +++ gcc/opts.cc | 4 ++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index f5f43d5e9a7..7acdee49551 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -219,6 +219,8 @@ diagnostic_initialize (diagnostic_context *context, int n_opts) context->show_line_numbers_p = false; context->min_margin_width = 0; context->show_ruler_p = false; + context->report_bug = false; + if (const char *var = getenv ("GCC_EXTRA_DIAGNOSTIC_OUTPUT")) { if (!strcmp (var, "fixits-v1")) @@ -665,12 +667,12 @@ diagnostic_action_after_output (diagnostic_context *context, if (context->abort_on_error) real_abort (); - fnotice (stderr, "Please submit a full bug report,\n" - "with preprocessed source if appropriate.\n"); - if (count > 0) - fnotice (stderr, - ("Please include the complete backtrace " - "with any bug report.\n")); + const char *details + = context->report_bug ? "" : "(by using -freport-bug) "; + const char *ending = count > 0 ? "and the complete backtrace" : ""; + + fnotice (stderr, "\nPlease submit a full bug report, " + "with preprocessed source %s%s.\n", details, ending); fnotice (stderr, "See %s for instructions.\n", bug_report_url); exit (ICE_EXIT_CODE); @@ -1437,8 +1439,8 @@ num_digits (int value) /* Given a partial pathname as input, return another pathname that shares no directory elements with the pathname of __FILE__. This - is used by fancy_abort() to print `Internal compiler error in expr.cc' - instead of `Internal compiler error in ../../GCC/gcc/expr.cc'. */ + is used by fancy_abort() to print `internal compiler error in expr.cc' + instead of `internal compiler error in ../../GCC/gcc/expr.cc'. */ const char * trim_filename (const char *name) @@ -1988,7 +1990,7 @@ error_recursion (diagnostic_context *context) pp_newline_and_flush (context->printer); fnotice (stderr, - "Internal compiler error: Error reporting routines re-entered.\n"); + "internal compiler error: Error reporting routines re-entered.\n"); /* Call diagnostic_action_after_output to get the "please submit a bug report" message. */ diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h index ccaa33b5817..3ca32979dde 100644 --- a/gcc/diagnostic.h +++ b/gcc/diagnostic.h @@ -340,6 +340,9 @@ struct diagnostic_context source output. */ bool show_ruler_p; + /* True if -freport-bug option is used. */ + bool report_bug; + /* Used to specify additional diagnostic output to be emitted after the rest of the diagnostic. This is for implementing -fdiagnostics-parseable-fixits and GCC_EXTRA_DIAGNOSTIC_OUTPUT. */ diff --git a/gcc/opts.cc b/gcc/opts.cc index f21c821ab2e..7d30deb8e4b 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3158,6 +3158,10 @@ common_handle_option (struct gcc_options *opts, dc->tabstop = value; break; + case OPT_freport_bug: + dc->report_bug = value; + break; + default: /* If the flag was handled in a standard way, assume the lack of processing here is intentional. */
next reply other threads:[~2022-01-27 10:24 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-27 10:24 Martin Liska [this message] 2022-01-27 10:25 Martin Liska 2022-01-27 10:56 Martin Liska 2022-01-27 11:24 Martin Liska
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220127102419.5261F3947415@sourceware.org \ --to=marxin@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).