From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 02A413858D35; Thu, 16 Mar 2023 14:50:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02A413858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678978238; bh=Kws8EsX0MnhrJu0Kf15F9KVyAtYs40vLonAF25cyxhQ=; h=From:To:Subject:Date:From; b=ExBxyhDbs/JryP/LxOz98oKDurN7wo1JnyQo1D4Rf6cRUmgOJw/Bz3Vw3MeRG/obW IynFZowd+j8vqovHH3L6T3zlkOJdYVeq0UeGoVyqL9T6XdPbH5SwBafnL4pe7dXIG2 4/xNVF4iPhTPCTHNol2iZ6iAjhu5tKdEk+EecYZU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6713] middle-end: always find a basename for -fdiagnostics-format=* X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: bd2d206b7b7d32ef6f45ce23192cfaf5fe14ac3d X-Git-Newrev: c5e2c3dd6afcf9b152df72b30e205b0180c0afd5 Message-Id: <20230316145038.02A413858D35@sourceware.org> Date: Thu, 16 Mar 2023 14:50:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c5e2c3dd6afcf9b152df72b30e205b0180c0afd5 commit r13-6713-gc5e2c3dd6afcf9b152df72b30e205b0180c0afd5 Author: Martin Liska Date: Tue Jan 10 15:14:05 2023 +0100 middle-end: always find a basename for -fdiagnostics-format=* In some situations, x_dump_base_name is NULL and thus we can and should use x_main_input_basename which should never be NULL. PR middle-end/106133 gcc/ChangeLog: * gcc.cc (driver_handle_option): Use x_main_input_basename if x_dump_base_name is null. * opts.cc (common_handle_option): Likewise. gcc/testsuite/ChangeLog: * c-c++-common/pr106133.c: New test. Diff: --- gcc/gcc.cc | 10 +++++++--- gcc/opts.cc | 10 +++++++--- gcc/testsuite/c-c++-common/pr106133.c | 3 +++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/gcc.cc b/gcc/gcc.cc index becc56051a8..16bb07f2cdc 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -4291,9 +4291,13 @@ driver_handle_option (struct gcc_options *opts, break; case OPT_fdiagnostics_format_: - diagnostic_output_format_init (dc, opts->x_dump_base_name, - (enum diagnostics_output_format)value); - break; + { + const char *basename = (opts->x_dump_base_name ? opts->x_dump_base_name + : opts->x_main_input_basename); + diagnostic_output_format_init (dc, basename, + (enum diagnostics_output_format)value); + break; + } case OPT_Wa_: { diff --git a/gcc/opts.cc b/gcc/opts.cc index 3bc17a187fe..f102c1328b9 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -2878,9 +2878,13 @@ common_handle_option (struct gcc_options *opts, break; case OPT_fdiagnostics_format_: - diagnostic_output_format_init (dc, opts->x_dump_base_name, - (enum diagnostics_output_format)value); - break; + { + const char *basename = (opts->x_dump_base_name ? opts->x_dump_base_name + : opts->x_main_input_basename); + diagnostic_output_format_init (dc, basename, + (enum diagnostics_output_format)value); + break; + } case OPT_fdiagnostics_parseable_fixits: dc->extra_output_kind = (value diff --git a/gcc/testsuite/c-c++-common/pr106133.c b/gcc/testsuite/c-c++-common/pr106133.c new file mode 100644 index 00000000000..7d2c5afe417 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr106133.c @@ -0,0 +1,3 @@ +/* PR middle-end/106133 */ +/* { dg-do compile } */ +/* { dg-options "-fdiagnostics-format=json-file -E" } */