On 1/6/23 14:21, David Malcolm wrote:
> On Fri, 2023-01-06 at 12:33 +0100, Martin Liška wrote:
>> Patch can bootstrap on x86_64-linux-gnu and survives regression
>> tests.
>
> Thanks for the patch.
>
> I noticed that you marked PR 108307 as a dup of this, which covers
> -fdiagnostics-format=sarif-file (and a .S file as input).
>
> The patch doesn't add any test coverage (for either of the diagnostic
> formats).
>
> If we try to emit a diagnostic and base_file_name is NULL, and the user
> requested one of -fdiagnostics-format={json,sarif}-file, where do the
> diagnostics go? Where should they go?
Hey.
I've done a new version of the patch where I utilize x_main_input_basename.
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed?
Thanks,
Martin
From 078233b4f84ae6d81a7327589723b2be518d29ca Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Tue, 10 Jan 2023 15:14:05 +0100
Subject: [PATCH] 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.
---
gcc/gcc.cc | 10 +++++++---
gcc/opts.cc | 10 +++++++---
gcc/testsuite/c-c++-common/pr106133.c | 3 +++
3 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 gcc/testsuite/c-c++-common/pr106133.c
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index d629ca5e424..382ca817a09 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -4290,9 +4290,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 9ba47d7deaa..4809c18a529 100644
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -2863,9 +2863,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" } */
--
2.39.0
