@@ -6109,7 +6109,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
richloc, dlevel);
diagnostic_override_option_index (&diagnostic,
c_option_controlling_cpp_error (reason));
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (level == CPP_DL_WARNING_SYSHDR)
global_dc->dc_warn_system_headers = save_warn_system_headers;
return ret;
@@ -5486,7 +5486,7 @@ warn_defaults_to (location_t location, int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc,
flag_isoc99 ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt;
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (ap);
}
@@ -48,7 +48,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc11)
? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = OPT_Wc99_c11_compat;
- warned = report_diagnostic (&diagnostic);
+ warned = diagnostic_report_diagnostic (global_dc, &diagnostic);
}
/* -Wno-c99-c11-compat suppresses even the pedwarns. */
else if (warn_c99_c11_compat == 0)
@@ -58,7 +58,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...)
{
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN);
diagnostic.option_index = opt;
- warned = report_diagnostic (&diagnostic);
+ warned = diagnostic_report_diagnostic (global_dc, &diagnostic);
}
va_end (ap);
return warned;
@@ -92,7 +92,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc99)
? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt;
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
warned = true;
goto out;
}
@@ -105,7 +105,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc99)
? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = OPT_Wc90_c99_compat;
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
}
/* -Wno-c90-c99-compat suppresses the pedwarns. */
else if (warn_c90_c99_compat == 0)
@@ -115,7 +115,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
{
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN);
diagnostic.option_index = opt;
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
warned = true;
}
out:
@@ -3755,7 +3755,7 @@ pedwarn_cxx98 (location_t location, int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc,
(cxx_dialect == cxx98) ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt;
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (ap);
return ret;
}
@@ -1076,7 +1076,7 @@ diagnostic_impl (rich_location *richloc, int opt,
if (kind == DK_WARNING || kind == DK_PEDWARN)
diagnostic.option_index = opt;
}
- return report_diagnostic (&diagnostic);
+ return diagnostic_report_diagnostic (global_dc, &diagnostic);
}
/* Same as diagonostic_n_impl taking rich_location instead of location_t. */
@@ -1092,7 +1092,7 @@ diagnostic_n_impl_richloc (rich_location *richloc, int opt, int n,
ap, richloc, kind);
if (kind == DK_WARNING)
diagnostic.option_index = opt;
- return report_diagnostic (&diagnostic);
+ return diagnostic_report_diagnostic (global_dc, &diagnostic);
}
/* Implement inform_n, warning_n, and error_n, as documented and
@@ -278,8 +278,6 @@ extern diagnostic_context *global_dc;
(!(DC)->dc_inhibit_warnings \
&& !(in_system_header_at (LOC) && !(DC)->dc_warn_system_headers))
-#define report_diagnostic(D) diagnostic_report_diagnostic (global_dc, D)
-
/* Override the option index to be used for reporting a
diagnostic. */
#define diagnostic_override_option_index(DI, OPTIDX) \
@@ -1062,7 +1062,7 @@ cb_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
richloc, dlevel);
if (reason == CPP_W_WARNING_DIRECTIVE)
diagnostic_override_option_index (&diagnostic, OPT_Wcpp);
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (level == CPP_DL_WARNING_SYSHDR)
global_dc->dc_warn_system_headers = save_warn_system_headers;
return ret;
@@ -789,7 +789,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING);
diagnostic.option_index = opt;
- bool ret = report_diagnostic (&diagnostic);
+ bool ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (buffered_p)
{
@@ -1138,7 +1138,7 @@ gfc_warning_now_at (location_t loc, int opt, const char *gmsgid, ...)
va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_WARNING);
diagnostic.option_index = opt;
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
return ret;
}
@@ -1157,7 +1157,7 @@ gfc_warning_now (int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING);
diagnostic.option_index = opt;
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
return ret;
}
@@ -1176,7 +1176,7 @@ gfc_warning_internal (int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING);
diagnostic.option_index = opt;
- ret = report_diagnostic (&diagnostic);
+ ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
return ret;
}
@@ -1194,7 +1194,7 @@ gfc_error_now (const char *gmsgid, ...)
va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ERROR);
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
}
@@ -1210,7 +1210,7 @@ gfc_fatal_error (const char *gmsgid, ...)
va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_FATAL);
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
gcc_unreachable ();
@@ -1295,7 +1295,7 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap)
}
diagnostic_set_info (&diagnostic, gmsgid, &argp, &richloc, DK_ERROR);
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
if (buffered_p)
{
@@ -1345,7 +1345,7 @@ gfc_internal_error (const char *gmsgid, ...)
va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ICE);
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp);
gcc_unreachable ();
@@ -71,7 +71,7 @@ diagnostic_for_asm (const rtx_insn *insn, const char *msg, va_list *args_ptr,
diagnostic_set_info (&diagnostic, msg, args_ptr,
&richloc, kind);
- report_diagnostic (&diagnostic);
+ diagnostic_report_diagnostic (global_dc, &diagnostic);
}
void
@@ -150,7 +150,7 @@ format_warning_va (const substring_loc &fmt_loc,
diagnostic_info diagnostic;
diagnostic_set_info (&diagnostic, gmsgid, ap, &richloc, DK_WARNING);
diagnostic.option_index = opt;
- bool warned = report_diagnostic (&diagnostic);
+ bool warned = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (!err && fmt_substring_loc && !substring_within_range)
/* Case 2. */