diff options
author | David Malcolm <dmalcolm@redhat.com> | 2023-12-06 12:35:08 -0500 |
---|---|---|
committer | David Malcolm <dmalcolm@redhat.com> | 2023-12-06 12:35:08 -0500 |
commit | 8fc4e6c397e1ce64bec6f9fed148950821cc79e7 (patch) | |
tree | 35aad37e7fcdbf9a213dbc6f2b3ca8389c9ac20d /gcc/diagnostic.h | |
parent | e7d6c277fa28c0b9b621d23c471e0388d2912644 (diff) | |
download | gcc-upstream-8fc4e6c397e1ce64bec6f9fed148950821cc79e7.tar.gz |
diagnostics: use const and references for diagnostic_info
No functional change intended.
gcc/c-family/ChangeLog:
* c-opts.cc (c_diagnostic_finalizer): Make "diagnostic" param
const.
gcc/cp/ChangeLog:
* cp-tree.h (cxx_print_error_function): Make diagnostic_info param
const.
* error.cc (cxx_print_error_function): Likewise.
(cp_diagnostic_starter): Likewise.
(cp_print_error_function): Likewise.
gcc/ChangeLog:
* diagnostic-format-json.cc (on_begin_diagnostic): Convert param
to const reference.
(on_end_diagnostic): Likewise.
(json_output_format::on_end_diagnostic): Likewise.
* diagnostic-format-sarif.cc
(sarif_invocation::add_notification_for_ice): Likewise.
(sarif_result::on_nested_diagnostic): Likewise.
(sarif_ice_notification::sarif_ice_notification): Likewise.
(sarif_builder::end_diagnostic): Likewise.
(sarif_builder::make_result_object): Likewise.
(make_reporting_descriptor_object_for_warning): Likewise.
(sarif_builder::make_locations_arr): Likewise.
(sarif_output_format::on_begin_diagnostic): Likewise.
(sarif_output_format::on_end_diagnostic): Likewise.
* diagnostic.cc (default_diagnostic_starter): Make diagnostic_info
param const.
(default_diagnostic_finalizer): Likewise.
(diagnostic_context::report_diagnostic): Pass diagnostic by
reference to on_{begin,end}_diagnostic.
(diagnostic_text_output_format::on_begin_diagnostic): Convert
param to const reference.
(diagnostic_text_output_format::on_end_diagnostic): Likewise.
* diagnostic.h (diagnostic_starter_fn): Make diagnostic_info param
const.
(diagnostic_finalizer_fn): Likeewise.
(diagnostic_output_format::on_begin_diagnostic): Convert param to
const reference.
(diagnostic_output_format::on_end_diagnostic): Likewise.
(diagnostic_text_output_format::on_begin_diagnostic): Likewise.
(diagnostic_text_output_format::on_end_diagnostic): Likewise.
(default_diagnostic_starter): Make diagnostic_info param const.
(default_diagnostic_finalizer): Likewise.
* langhooks-def.h (lhd_print_error_function): Make diagnostic_info
param const.
* langhooks.cc (lhd_print_error_function): Likewise.
* langhooks.h (lang_hooks::print_error_function): Likewise.
* tree-diagnostic.cc (diagnostic_report_current_function):
Likewise.
(default_tree_diagnostic_starter): Likewise.
(virt_loc_aware_diagnostic_finalizer): Likewise.
* tree-diagnostic.h (diagnostic_report_current_function):
Likewise.
(virt_loc_aware_diagnostic_finalizer): Likewise.
gcc/fortran/ChangeLog:
* error.cc (gfc_diagnostic_starter): Make diagnostic_info param
const.
(gfc_diagnostic_finalizer): Likewise.
gcc/jit/ChangeLog:
* dummy-frontend.cc (jit_begin_diagnostic): Make diagnostic_info
param const.
(jit_end_diagnostic): Likewise. Pass to add_diagnostic by
reference.
* jit-playback.cc (jit::playback::context::add_diagnostic):
Convert diagnostic_info to const reference.
* jit-playback.h (jit::playback::context::add_diagnostic):
Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/plugin/show_template_tree_color_plugin.c
(noop_starter_fn): Make diagnostic_info param const.
* gcc.dg/plugin/diagnostic_group_plugin.c
(test_diagnostic_starter): Likewise.
* gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
(custom_diagnostic_finalizer): Likewise.
* gcc.dg/plugin/location_overflow_plugin.c
(verify_unpacked_ranges): Likewise.
(verify_no_columns): Likewise.
libcc1/ChangeLog:
* context.cc (plugin_print_error_function): Make diagnostic_info
param const.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'gcc/diagnostic.h')
-rw-r--r-- | gcc/diagnostic.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h index b57556f9759..4fc31438b16 100644 --- a/gcc/diagnostic.h +++ b/gcc/diagnostic.h @@ -171,13 +171,13 @@ struct diagnostic_info /* Forward declarations. */ typedef void (*diagnostic_starter_fn) (diagnostic_context *, - diagnostic_info *); + const diagnostic_info *); typedef void (*diagnostic_start_span_fn) (diagnostic_context *, expanded_location); typedef void (*diagnostic_finalizer_fn) (diagnostic_context *, - diagnostic_info *, + const diagnostic_info *, diagnostic_t); typedef int (*diagnostic_option_enabled_cb) (int, unsigned, void *); @@ -205,8 +205,8 @@ public: virtual void on_begin_group () = 0; virtual void on_end_group () = 0; - virtual void on_begin_diagnostic (diagnostic_info *) = 0; - virtual void on_end_diagnostic (diagnostic_info *, + virtual void on_begin_diagnostic (const diagnostic_info &) = 0; + virtual void on_end_diagnostic (const diagnostic_info &, diagnostic_t orig_diag_kind) = 0; virtual void on_diagram (const diagnostic_diagram &diagram) = 0; @@ -233,8 +233,8 @@ public: ~diagnostic_text_output_format (); void on_begin_group () override {} void on_end_group () override {} - void on_begin_diagnostic (diagnostic_info *) override; - void on_end_diagnostic (diagnostic_info *, + void on_begin_diagnostic (const diagnostic_info &) override; + void on_end_diagnostic (const diagnostic_info &, diagnostic_t orig_diag_kind) override; void on_diagram (const diagnostic_diagram &diagram) override; }; @@ -985,10 +985,11 @@ extern void diagnostic_append_note (diagnostic_context *, location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(3,4); #endif extern char *diagnostic_build_prefix (diagnostic_context *, const diagnostic_info *); -void default_diagnostic_starter (diagnostic_context *, diagnostic_info *); +void default_diagnostic_starter (diagnostic_context *, const diagnostic_info *); void default_diagnostic_start_span_fn (diagnostic_context *, expanded_location); -void default_diagnostic_finalizer (diagnostic_context *, diagnostic_info *, +void default_diagnostic_finalizer (diagnostic_context *, + const diagnostic_info *, diagnostic_t); void diagnostic_set_caret_max_width (diagnostic_context *context, int value); |