diagnostics: rename dc.printer to m_printer [PR116613]

Rename diagnostic_context's "printer" field to "m_printer",
for consistency with other fields, and to highlight places
where we currently use this, to help assess feasibility
of supporting multiple output sinks (PR other/116613).

No functional change intended.

gcc/ChangeLog:
	PR other/116613
	* attribs.cc (decls_mismatched_attributes): Rename
	diagnostic_context's "printer" field to "m_printer".
	(attr_access::array_as_string): Likewise.
	* diagnostic-format-json.cc
	(json_output_format::on_report_diagnostic): Likewise.
	(diagnostic_output_format_init_json): Likewise.
	* diagnostic-format-sarif.cc
	(sarif_result::on_nested_diagnostic): Likewise.
	(sarif_ice_notification): Likewise.
	(sarif_builder::on_report_diagnostic): Likewise.
	(sarif_builder::make_result_object): Likewise.
	(sarif_builder::make_location_object): Likewise.
	(sarif_builder::make_message_object_for_diagram): Likewise.
	(diagnostic_output_format_init_sarif): Likewise.
	* diagnostic-format-text.cc
	(diagnostic_text_output_format::~diagnostic_text_output_format):
	Likewise.
	(diagnostic_text_output_format::on_report_diagnostic): Likewise.
	(diagnostic_text_output_format::on_diagram): Likewise.
	(diagnostic_text_output_format::print_any_cwe): Likewise.
	(diagnostic_text_output_format::print_any_rules): Likewise.
	(diagnostic_text_output_format::print_option_information):
	Likewise.
	* diagnostic-format.h (diagnostic_output_format::get_printer):
	New.
	* diagnostic-global-context.cc (verbatim): Rename
	diagnostic_context's "printer" field to "m_printer".
	* diagnostic-path.cc (path_label::get_text): Likewise.
	(print_path_summary_as_text): Likewise.
	(diagnostic_context::print_path): Likewise.
	(selftest::test_empty_path): Likewise.
	(selftest::test_intraprocedural_path): Likewise.
	(selftest::test_interprocedural_path_1): Likewise.
	(selftest::test_interprocedural_path_2): Likewise.
	(selftest::test_recursion): Likewise.
	(selftest::test_control_flow_1): Likewise.
	(selftest::test_control_flow_2): Likewise.
	(selftest::test_control_flow_3): Likewise.
	(assert_cfg_edge_path_streq): Likewise.
	(selftest::test_control_flow_5): Likewise.
	(selftest::test_control_flow_6): Likewise.
	* diagnostic-show-locus.cc (layout::layout): Likewise.
	(selftest::test_layout_x_offset_display_utf8): Likewise.
	(selftest::test_layout_x_offset_display_tab): Likewise.
	(selftest::test_diagnostic_show_locus_unknown_location): Likewise.
	(selftest::test_one_liner_simple_caret): Likewise.
	(selftest::test_one_liner_no_column): Likewise.
	(selftest::test_one_liner_caret_and_range): Likewise.
	(selftest::test_one_liner_multiple_carets_and_ranges): Likewise.
	(selftest::test_one_liner_fixit_insert_before): Likewise.
	(selftest::test_one_liner_fixit_insert_after): Likewise.
	(selftest::test_one_liner_fixit_remove): Likewise.
	(selftest::test_one_liner_fixit_replace): Likewise.
	(selftest::test_one_liner_fixit_replace_non_equal_range):
	Likewise.
	(selftest::test_one_liner_fixit_replace_equal_secondary_range):
	Likewise.
	(selftest::test_one_liner_fixit_validation_adhoc_locations):
	Likewise.
	(selftest::test_one_liner_many_fixits_1): Likewise.
	(selftest::test_one_liner_many_fixits_2): Likewise.
	(selftest::test_one_liner_labels): Likewise.
	(selftest::test_one_liner_simple_caret_utf8): Likewise.
	(selftest::test_one_liner_caret_and_range_utf8): Likewise.
	(selftest::test_one_liner_multiple_carets_and_ranges_utf8):
	Likewise.
	(selftest::test_one_liner_fixit_insert_before_utf8): Likewise.
	(selftest::test_one_liner_fixit_insert_after_utf8): Likewise.
	(selftest::test_one_liner_fixit_remove_utf8): Likewise.
	(selftest::test_one_liner_fixit_replace_utf8): Likewise.
	(selftest::test_one_liner_fixit_replace_non_equal_range_utf8):
	Likewise.
	(selftest::test_one_liner_fixit_replace_equal_secondary_range_utf8):
	Likewise.
	(selftest::test_one_liner_fixit_validation_adhoc_locations_utf8):
	Likewise.
	(selftest::test_one_liner_many_fixits_1_utf8): Likewise.
	(selftest::test_one_liner_many_fixits_2_utf8): Likewise.
	(selftest::test_one_liner_labels_utf8): Likewise.
	(selftest::test_one_liner_colorized_utf8): Likewise.
	(selftest::test_add_location_if_nearby): Likewise.
	(selftest::test_diagnostic_show_locus_fixit_lines): Likewise.
	(selftest::test_overlapped_fixit_printing): Likewise.
	(selftest::test_overlapped_fixit_printing_utf8): Likewise.
	(selftest::test_overlapped_fixit_printing_2): Likewise.
	(selftest::test_fixit_insert_containing_newline): Likewise.
	(selftest::test_fixit_insert_containing_newline_2): Likewise.
	(selftest::test_fixit_replace_containing_newline): Likewise.
	(selftest::test_fixit_deletion_affecting_newline): Likewise.
	(selftest::test_tab_expansion): Likewise.
	(selftest::test_escaping_bytes_1): Likewise.
	(selftest::test_escaping_bytes_2): Likewise.
	(selftest::test_line_numbers_multiline_range): Likewise.
	* diagnostic.cc (file_name_as_prefix): Likewise.
	(diagnostic_set_caret_max_width): Likewise.
	(diagnostic_context::initialize): Likewise.
	(diagnostic_context::color_init): Likewise.
	(diagnostic_context::urls_init): Likewise.
	(diagnostic_context::finish): Likewise.
	(diagnostic_context::get_location_text): Likewise.
	(diagnostic_build_prefix): Likewise.
	(diagnostic_context::report_current_module): Likewise.
	(default_diagnostic_starter): Likewise.
	(default_diagnostic_start_span_fn): Likewise.
	(default_diagnostic_finalizer): Likewise.
	(diagnostic_context::report_diagnostic): Likewise.
	(diagnostic_append_note): Likewise.
	(diagnostic_context::error_recursion): Likewise.
	(fancy_abort): Likewise.
	* diagnostic.h (diagnostic_context::set_show_highlight_colors):
	Likewise.
	(diagnostic_context::printer): Rename to...
	(diagnostic_context::m_printer): ...this.
	(diagnostic_format_decoder): Rename diagnostic_context's "printer"
	field to "m_printer".
	(diagnostic_prefixing_rule): Likewise.
	(diagnostic_ready_p): Likewise.
	* gimple-ssa-warn-access.cc (pass_waccess::maybe_warn_memmodel):
	Likewise.
	* langhooks.cc (lhd_print_error_function): Likewise.
	* lto-wrapper.cc (print_lto_docs_link): Likewise.
	* opts-global.cc (init_options_once): Likewise.
	* opts.cc (common_handle_option): Likewise.
	* simple-diagnostic-path.cc (simple_diagnostic_path_cc_tests):
	Likewise.
	* text-art/dump.h (dump_to_file<T>): Likewise.
	* toplev.cc (announce_function): Likewise.
	(toplev::main): Likewise.
	* tree-diagnostic.cc (default_tree_diagnostic_starter): Likewise.
	* tree.cc (escaped_string::escape): Likewise.
	(selftest::test_escaped_strings): Likewise.

gcc/ada/ChangeLog:
	PR other/116613
	* gcc-interface/misc.cc (internal_error_function): Rename
	diagnostic_context's "printer" field to "m_printer".

gcc/analyzer/ChangeLog:
	PR other/116613
	* access-diagram.cc (access_range::dump): Rename
	diagnostic_context's "printer" field to "m_printer".
	* analyzer-language.cc (on_finish_translation_unit): Likewise.
	* analyzer.cc (make_label_text): Likewise.
	(make_label_text_n): Likewise.
	* call-details.cc (call_details::dump): Likewise.
	* call-summary.cc (call_summary::dump): Likewise.
	(call_summary_replay::dump): Likewise.
	* checker-event.cc (checker_event::debug): Likewise.
	* constraint-manager.cc (range::dump): Likewise.
	(bounded_range::dump): Likewise.
	(bounded_ranges::dump): Likewise.
	(constraint_manager::dump): Likewise.
	* diagnostic-manager.cc
	(diagnostic_manager::emit_saved_diagnostic): Likewise.
	* engine.cc (exploded_node::dump): Likewise.
	(exploded_path::dump): Likewise.
	(run_checkers): Likewise.
	* kf-analyzer.cc (kf_analyzer_dump_escaped::impl_call_pre):
	Likewise.
	* pending-diagnostic.cc (evdesc::event_desc::formatted_print):
	Likewise.
	* program-point.cc (function_point::print_source_line): Likewise.
	(program_point::dump): Likewise.
	* program-state.cc (extrinsic_state::dump_to_file): Likewise.
	(sm_state_map::dump): Likewise.
	(program_state::dump_to_file): Likewise.
	* ranges.cc (symbolic_byte_offset::dump): Likewise.
	(symbolic_byte_range::dump): Likewise.
	* region-model-reachability.cc (reachable_regions::dump): Likewise.
	* region-model.cc (region_to_value_map::dump): Likewise.
	(region_model::dump): Likewise.
	(model_merger::dump): Likewise.
	* region.cc (region_offset::dump): Likewise.
	(region::dump): Likewise.
	* sm-malloc.cc (deallocator_set::dump): Likewise.
	(sufficiently_similar_p): Likewise.
	* store.cc (uncertainty_t::dump): Likewise.
	(binding_key::dump): Likewise.
	(binding_map::dump): Likewise.
	(binding_cluster::dump): Likewise.
	(store::dump): Likewise.
	* supergraph.cc (supergraph::dump_dot_to_file): Likewise.
	(superedge::dump): Likewise.
	* svalue.cc (svalue::dump): Likewise.

gcc/c-family/ChangeLog:
	PR other/116613
	* c-format.cc (selftest::test_type_mismatch_range_labels): Rename
	diagnostic_context's "printer" field to "m_printer".
	(selftest::test_type_mismatch_range_labels): Likewise.
	* c-opts.cc (c_diagnostic_finalizer): Likewise.

gcc/c/ChangeLog:
	PR other/116613
	* c-objc-common.cc (c_initialize_diagnostics): Rename
	diagnostic_context's "printer" field to "m_printer".

gcc/cp/ChangeLog:
	PR other/116613
	* error.cc (cxx_initialize_diagnostics): Rename
	diagnostic_context's "printer" field to "m_printer".
	(cxx_print_error_function): Likewise.
	(cp_diagnostic_starter): Likewise.
	(cp_print_error_function): Likewise.
	(print_instantiation_full_context): Likewise.
	(print_instantiation_partial_context_line): Likewise.
	(maybe_print_constexpr_context): Likewise.
	(print_location): Likewise.
	(print_constrained_decl_info): Likewise.
	(print_concept_check_info): Likewise.
	(print_constraint_context_head): Likewise.
	(print_requires_expression_info): Likewise.
	* module.cc (noisy_p): Likewise.

gcc/d/ChangeLog:
	PR other/116613
	* d-diagnostic.cc (d_diagnostic_report_diagnostic): Rename
	diagnostic_context's "printer" field to "m_printer".

gcc/fortran/ChangeLog:
	PR other/116613
	* error.cc (gfc_clear_pp_buffer): Rename diagnostic_context's
	"printer" field to "m_printer".
	(gfc_warning): Likewise.
	(gfc_diagnostic_build_kind_prefix): Likewise.
	(gfc_diagnostic_build_locus_prefix): Likewise.
	(gfc_diagnostic_starter): Likewise.
	(gfc_diagnostic_starter): Likewise.
	(gfc_diagnostic_start_span): Likewise.
	(gfc_diagnostic_finalizer): Likewise.
	(gfc_warning_check): Likewise.
	(gfc_error_opt): Likewise.
	(gfc_error_check): Likewise.

gcc/jit/ChangeLog:
	PR other/116613
	* jit-playback.cc (add_diagnostic): Rename diagnostic_context's
	"printer" field to "m_printer".

gcc/testsuite/ChangeLog:
	PR other/116613
	* gcc.dg/plugin/analyzer_cpython_plugin.c (dump_refcnt_info):
	Update for renaming of field "printer" to "m_printer".
	* gcc.dg/plugin/diagnostic_group_plugin.c
	(test_diagnostic_starter): Likewise.
	(test_diagnostic_start_span_fn): Likewise.
	(test_output_format::on_begin_group): Likewise.
	(test_output_format::on_end_group): Likewise.
	* gcc.dg/plugin/diagnostic_plugin_test_paths.c: Likewise.
	* gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
	(custom_diagnostic_finalizer): Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

1 files changed, 27 insertions, 23 deletions

diff --git a/gcc/fortran/error.cc b/gcc/fortran/error.cc
index ffe95d1..e328dbd 100644
--- a/gcc/fortran/error.cc
+++ b/gcc/fortran/error.cc
@@ -923,7 +923,7 @@ error_printf (const char *gmsgid, ...)
 static void
 gfc_clear_pp_buffer (output_buffer *this_buffer)
 {
-  pretty_printer *pp = global_dc->printer;
+  pretty_printer *pp = global_dc->m_printer;
   output_buffer *tmp_buffer = pp_buffer (pp);
   pp_buffer (pp) = this_buffer;
   pp_clear_output_area (pp);
@@ -963,7 +963,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap)
   diagnostic_info diagnostic;
   rich_location rich_loc (line_table, UNKNOWN_LOCATION);
   bool fatal_errors = global_dc->m_fatal_errors;
-  pretty_printer *pp = global_dc->printer;
+  pretty_printer *pp = global_dc->m_printer;
   output_buffer *tmp_buffer = pp_buffer (pp);
 
   gfc_clear_pp_buffer (pp_warning_buffer);
@@ -1196,7 +1196,7 @@ gfc_diagnostic_build_kind_prefix (diagnostic_context *context,
   gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND);
   const char *text = _(diagnostic_kind_text[diagnostic->kind]);
   const char *text_cs = "", *text_ce = "";
-  pretty_printer *pp = context->printer;
+  pretty_printer *const pp = context->m_printer;
 
   if (diagnostic_kind_color[diagnostic->kind])
     {
@@ -1213,7 +1213,7 @@ static char *
 gfc_diagnostic_build_locus_prefix (diagnostic_context *context,
 				   expanded_location s)
 {
-  pretty_printer *pp = context->printer;
+  pretty_printer *const pp = context->m_printer;
   const char *locus_cs = colorize_start (pp_show_color (pp), "locus");
   const char *locus_ce = colorize_stop (pp_show_color (pp));
   return (s.file == NULL
@@ -1232,7 +1232,7 @@ static char *
 gfc_diagnostic_build_locus_prefix (diagnostic_context *context,
 				   expanded_location s, expanded_location s2)
 {
-  pretty_printer *pp = context->printer;
+  pretty_printer *const pp = context->m_printer;
   const char *locus_cs = colorize_start (pp_show_color (pp), "locus");
   const char *locus_ce = colorize_stop (pp_show_color (pp));
 
@@ -1269,6 +1269,7 @@ static void
 gfc_diagnostic_starter (diagnostic_context *context,
 			const diagnostic_info *diagnostic)
 {
+  pretty_printer *const pp = context->m_printer;
   char * kind_prefix = gfc_diagnostic_build_kind_prefix (context, diagnostic);
 
   expanded_location s1 = diagnostic_expand_location (diagnostic);
@@ -1290,7 +1291,7 @@ gfc_diagnostic_starter (diagnostic_context *context,
       || diagnostic_location (diagnostic, 0) <= BUILTINS_LOCATION
       || diagnostic_location (diagnostic, 0) == context->m_last_location)
     {
-      pp_set_prefix (context->printer,
+      pp_set_prefix (pp,
 		     concat (locus_prefix, " ", kind_prefix, NULL));
       free (locus_prefix);
 
@@ -1304,26 +1305,27 @@ gfc_diagnostic_starter (diagnostic_context *context,
 	  [locus]:[prefix]: (1)
 
 	 and we flush with a new line before setting the new prefix.  */
-      pp_string (context->printer, "(1)");
-      pp_newline (context->printer);
+      pp_string (pp, "(1)");
+      pp_newline (pp);
       locus_prefix = gfc_diagnostic_build_locus_prefix (context, s2);
-      pp_set_prefix (context->printer,
+      pp_set_prefix (pp,
 		     concat (locus_prefix, " ", kind_prefix, NULL));
       free (kind_prefix);
       free (locus_prefix);
     }
   else
     {
-      pp_verbatim (context->printer, "%s", locus_prefix);
+      pp_verbatim (pp, "%s", locus_prefix);
       free (locus_prefix);
       /* Fortran uses an empty line between locus and caret line.  */
-      pp_newline (context->printer);
-      pp_set_prefix (context->printer, NULL);
-      pp_newline (context->printer);
-      diagnostic_show_locus (context, diagnostic->richloc, diagnostic->kind);
+      pp_newline (pp);
+      pp_set_prefix (pp, NULL);
+      pp_newline (pp);
+      diagnostic_show_locus (context, diagnostic->richloc, diagnostic->kind,
+			     pp);
       /* If the caret line was shown, the prefix does not contain the
 	 locus.  */
-      pp_set_prefix (context->printer, kind_prefix);
+      pp_set_prefix (pp, kind_prefix);
     }
 }
 
@@ -1333,11 +1335,12 @@ gfc_diagnostic_start_span (diagnostic_context *context,
 {
   char *locus_prefix;
   locus_prefix = gfc_diagnostic_build_locus_prefix (context, exploc);
-  pp_verbatim (context->printer, "%s", locus_prefix);
+  pretty_printer * const pp = context->m_printer;
+  pp_verbatim (pp, "%s", locus_prefix);
   free (locus_prefix);
-  pp_newline (context->printer);
+  pp_newline (pp);
   /* Fortran uses an empty line between locus and caret line.  */
-  pp_newline (context->printer);
+  pp_newline (pp);
 }
 
 
@@ -1346,8 +1349,9 @@ gfc_diagnostic_finalizer (diagnostic_context *context,
 			  const diagnostic_info *diagnostic ATTRIBUTE_UNUSED,
 			  diagnostic_t orig_diag_kind ATTRIBUTE_UNUSED)
 {
-  pp_destroy_prefix (context->printer);
-  pp_newline_and_flush (context->printer);
+  pretty_printer *const pp = context->m_printer;
+  pp_destroy_prefix (pp);
+  pp_newline_and_flush (pp);
 }
 
 /* Immediate warning (i.e. do not buffer the warning) with an explicit
@@ -1461,7 +1465,7 @@ gfc_warning_check (void)
 {
   if (! gfc_output_buffer_empty_p (pp_warning_buffer))
     {
-      pretty_printer *pp = global_dc->printer;
+      pretty_printer *pp = global_dc->m_printer;
       output_buffer *tmp_buffer = pp_buffer (pp);
       pp_buffer (pp) = pp_warning_buffer;
       pp_really_flush (pp);
@@ -1502,7 +1506,7 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap)
   diagnostic_info diagnostic;
   rich_location richloc (line_table, UNKNOWN_LOCATION);
   bool fatal_errors = global_dc->m_fatal_errors;
-  pretty_printer *pp = global_dc->printer;
+  pretty_printer *pp = global_dc->m_printer;
   output_buffer *tmp_buffer = pp_buffer (pp);
 
   gfc_clear_pp_buffer (pp_error_buffer);
@@ -1609,7 +1613,7 @@ gfc_error_check (void)
       || ! gfc_output_buffer_empty_p (pp_error_buffer))
     {
       error_buffer.flag = false;
-      pretty_printer *pp = global_dc->printer;
+      pretty_printer *pp = global_dc->m_printer;
       output_buffer *tmp_buffer = pp_buffer (pp);
       pp_buffer (pp) = pp_error_buffer;
       pp_really_flush (pp);