diff options
| author | Martin Liska <mliska@suse.cz> | 2023-01-10 15:14:05 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2023-03-16 15:50:00 +0100 |
| commit | c5e2c3dd6afcf9b152df72b30e205b0180c0afd5 (patch) | |
| tree | 15585a18ce3c2b3d7684cab1260b6ab94b2cf0cf /gcc | |
| parent | bd2d206b7b7d32ef6f45ce23192cfaf5fe14ac3d (diff) | |
| download | gcc-c5e2c3dd6afcf9b152df72b30e205b0180c0afd5.zip gcc-c5e2c3dd6afcf9b152df72b30e205b0180c0afd5.tar.gz gcc-c5e2c3dd6afcf9b152df72b30e205b0180c0afd5.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/gcc.cc | 10 | ||||
| -rw-r--r-- | gcc/opts.cc | 10 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/pr106133.c | 3 |
3 files changed, 17 insertions, 6 deletions
@@ -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 3bc17a1..f102c13 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 0000000..7d2c5af --- /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" } */ |