From 8fc4e6c397e1ce64bec6f9fed148950821cc79e7 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 6 Dec 2023 12:35:08 -0500 Subject: 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 --- gcc/diagnostic-format-json.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gcc/diagnostic-format-json.cc') diff --git a/gcc/diagnostic-format-json.cc b/gcc/diagnostic-format-json.cc index 141075b..418db74 100644 --- a/gcc/diagnostic-format-json.cc +++ b/gcc/diagnostic-format-json.cc @@ -43,12 +43,12 @@ public: m_cur_children_array = nullptr; } void - on_begin_diagnostic (diagnostic_info *) final override + on_begin_diagnostic (const diagnostic_info &) final override { /* No-op. */ } void - on_end_diagnostic (diagnostic_info *diagnostic, + on_end_diagnostic (const diagnostic_info &diagnostic, diagnostic_t orig_diag_kind) final override; void on_diagram (const diagnostic_diagram &) final override { @@ -188,7 +188,7 @@ json_from_metadata (const diagnostic_metadata *metadata) within current diagnostic group. */ void -json_output_format::on_end_diagnostic (diagnostic_info *diagnostic, +json_output_format::on_end_diagnostic (const diagnostic_info &diagnostic, diagnostic_t orig_diag_kind) { json::object *diag_obj = new json::object (); @@ -202,7 +202,7 @@ json_output_format::on_end_diagnostic (diagnostic_info *diagnostic, "must-not-happen" }; /* Lose the trailing ": ". */ - const char *kind_text = diagnostic_kind_text[diagnostic->kind]; + const char *kind_text = diagnostic_kind_text[diagnostic.kind]; size_t len = strlen (kind_text); gcc_assert (len > 2); gcc_assert (kind_text[len - 2] == ':'); @@ -217,15 +217,15 @@ json_output_format::on_end_diagnostic (diagnostic_info *diagnostic, diag_obj->set_string ("message", pp_formatted_text (m_context.printer)); pp_clear_output_area (m_context.printer); - if (char *option_text = m_context.make_option_name (diagnostic->option_index, + if (char *option_text = m_context.make_option_name (diagnostic.option_index, orig_diag_kind, - diagnostic->kind)) + diagnostic.kind)) { diag_obj->set_string ("option", option_text); free (option_text); } - if (char *option_url = m_context.make_option_url (diagnostic->option_index)) + if (char *option_url = m_context.make_option_url (diagnostic.option_index)) { diag_obj->set_string ("option_url", option_url); free (option_url); @@ -249,7 +249,7 @@ json_output_format::on_end_diagnostic (diagnostic_info *diagnostic, diag_obj->set_integer ("column-origin", m_context.m_column_origin); } - const rich_location *richloc = diagnostic->richloc; + const rich_location *richloc = diagnostic.richloc; json::array *loc_array = new json::array (); diag_obj->set ("locations", loc_array); @@ -280,9 +280,9 @@ json_output_format::on_end_diagnostic (diagnostic_info *diagnostic, TODO: inlining information TODO: macro expansion information. */ - if (diagnostic->metadata) + if (diagnostic.metadata) { - json::object *metadata_obj = json_from_metadata (diagnostic->metadata); + json::object *metadata_obj = json_from_metadata (diagnostic.metadata); diag_obj->set ("metadata", metadata_obj); } -- cgit v1.1