Skip to content

R
riscv-gcc-1
Commit 56d35585 by David Malcolm Committed by David Malcolm
Options

Eliminate report_diagnostic macro 

This patch eliminates the report_diagnostic macro, manually
expanding it in all sites in the code.

No functional change intended.

gcc/c-family/ChangeLog:
	* c-common.c (c_cpp_error): Replace report_diagnostic
	with diagnostic_report_diagnostic.

gcc/c/ChangeLog:
	* c-decl.c (warn_defaults_to): Replace report_diagnostic
	with diagnostic_report_diagnostic.
	* c-errors.c (pedwarn_c99): Likewise.
	(pedwarn_c90): Likewise.

gcc/cp/ChangeLog:
	* error.c (pedwarn_cxx98): Replace report_diagnostic
	with diagnostic_report_diagnostic.

gcc/ChangeLog:
	* diagnostic.c (diagnostic_impl): Replace report_diagnostic
	with diagnostic_report_diagnostic.
	(diagnostic_n_impl_richloc): Likewise.
	* diagnostic.h (report_diagnostic): Delete macro.
	* rtl-error.c (diagnostic_for_asm): Replace report_diagnostic
	with diagnostic_report_diagnostic.
	* substring-locations.c (format_warning_va): Likewise.

gcc/fortran/ChangeLog:
	* cpp.c (cb_cpp_error): Replace report_diagnostic
	with diagnostic_report_diagnostic.
	* error.c (gfc_warning): Likewise.
	(gfc_warning_now_at): Likewise.
	(gfc_warning_now): Likewise.
	(gfc_warning_internal): Likewise.
	(gfc_error_now): Likewise.
	(gfc_fatal_error): Likewise.
	(gfc_error_opt): Likewise.
	(gfc_internal_error): Likewise.

From-SVN: r247663
parent 80ceac09
Showing with 61 additions and 23 deletions
gcc/ChangeLog
2017-05-05 David Malcolm <dmalcolm@redhat.com> 2017-05-05 David Malcolm <dmalcolm@redhat.com>
* diagnostic.c (diagnostic_impl): Replace report_diagnostic
with diagnostic_report_diagnostic.
(diagnostic_n_impl_richloc): Likewise.
* diagnostic.h (report_diagnostic): Delete macro.
* rtl-error.c (diagnostic_for_asm): Replace report_diagnostic
with diagnostic_report_diagnostic.
* substring-locations.c (format_warning_va): Likewise.
2017-05-05 David Malcolm <dmalcolm@redhat.com>
* diagnostic.c (diagnostic_report_diagnostic): Eliminate * diagnostic.c (diagnostic_report_diagnostic): Eliminate
save/restor of format_spec. Move option-printing code to... save/restor of format_spec. Move option-printing code to...
(print_option_information): ...this new function, and (print_option_information): ...this new function, and
......
gcc/c-family/ChangeLog
2017-05-05 David Malcolm <dmalcolm@redhat.com>
* c-common.c (c_cpp_error): Replace report_diagnostic
with diagnostic_report_diagnostic.
2017-05-04 Martin Sebor <msebor@redhat.com> 2017-05-04 Martin Sebor <msebor@redhat.com>
PR translation/80280 PR translation/80280
......
gcc/c-family/c-common.c
...@@ -6109,7 +6109,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason, ...@@ -6109,7 +6109,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
richloc, dlevel); richloc, dlevel);
diagnostic_override_option_index (&diagnostic, diagnostic_override_option_index (&diagnostic,
c_option_controlling_cpp_error (reason)); c_option_controlling_cpp_error (reason));
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (level == CPP_DL_WARNING_SYSHDR) if (level == CPP_DL_WARNING_SYSHDR)
global_dc->dc_warn_system_headers = save_warn_system_headers; global_dc->dc_warn_system_headers = save_warn_system_headers;
return ret; return ret;
......
gcc/c/ChangeLog
2017-05-05 David Malcolm <dmalcolm@redhat.com>
* c-decl.c (warn_defaults_to): Replace report_diagnostic
with diagnostic_report_diagnostic.
* c-errors.c (pedwarn_c99): Likewise.
(pedwarn_c90): Likewise.
2017-05-01 Xi Ruoyao <ryxi@stu.xidian.edu.cn> 2017-05-01 Xi Ruoyao <ryxi@stu.xidian.edu.cn>
PR c++/80038 PR c++/80038
......
gcc/c/c-decl.c
...@@ -5486,7 +5486,7 @@ warn_defaults_to (location_t location, int opt, const char *gmsgid, ...) ...@@ -5486,7 +5486,7 @@ warn_defaults_to (location_t location, int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc,
flag_isoc99 ? DK_PEDWARN : DK_WARNING); flag_isoc99 ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (ap); va_end (ap);
} }
......
gcc/c/c-errors.c
...@@ -48,7 +48,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...) ...@@ -48,7 +48,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc11) (pedantic && !flag_isoc11)
? DK_PEDWARN : DK_WARNING); ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = OPT_Wc99_c11_compat; 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. */ /* -Wno-c99-c11-compat suppresses even the pedwarns. */
else if (warn_c99_c11_compat == 0) else if (warn_c99_c11_compat == 0)
...@@ -58,7 +58,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...) ...@@ -58,7 +58,7 @@ pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...)
{ {
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN); diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN);
diagnostic.option_index = opt; diagnostic.option_index = opt;
warned = report_diagnostic (&diagnostic); warned = diagnostic_report_diagnostic (global_dc, &diagnostic);
} }
va_end (ap); va_end (ap);
return warned; return warned;
...@@ -92,7 +92,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...) ...@@ -92,7 +92,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc99) (pedantic && !flag_isoc99)
? DK_PEDWARN : DK_WARNING); ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
warned = true; warned = true;
goto out; goto out;
} }
...@@ -105,7 +105,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...) ...@@ -105,7 +105,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
(pedantic && !flag_isoc99) (pedantic && !flag_isoc99)
? DK_PEDWARN : DK_WARNING); ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = OPT_Wc90_c99_compat; diagnostic.option_index = OPT_Wc90_c99_compat;
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
} }
/* -Wno-c90-c99-compat suppresses the pedwarns. */ /* -Wno-c90-c99-compat suppresses the pedwarns. */
else if (warn_c90_c99_compat == 0) else if (warn_c90_c99_compat == 0)
...@@ -115,7 +115,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...) ...@@ -115,7 +115,7 @@ pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
{ {
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN); diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, DK_PEDWARN);
diagnostic.option_index = opt; diagnostic.option_index = opt;
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
warned = true; warned = true;
} }
out: out:
......
gcc/cp/ChangeLog
2017-05-05 David Malcolm <dmalcolm@redhat.com>
* error.c (pedwarn_cxx98): Replace report_diagnostic
with diagnostic_report_diagnostic.
2017-05-05 Nathan Sidwell <nathan@acm.org> 2017-05-05 Nathan Sidwell <nathan@acm.org>
* cp-tree.h (IDENTIFIER_GLOBAL_VALUE): Use get_namespace_value. * cp-tree.h (IDENTIFIER_GLOBAL_VALUE): Use get_namespace_value.
......
gcc/cp/error.c
...@@ -3755,7 +3755,7 @@ pedwarn_cxx98 (location_t location, int opt, const char *gmsgid, ...) ...@@ -3755,7 +3755,7 @@ pedwarn_cxx98 (location_t location, int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc, diagnostic_set_info (&diagnostic, gmsgid, &ap, &richloc,
(cxx_dialect == cxx98) ? DK_PEDWARN : DK_WARNING); (cxx_dialect == cxx98) ? DK_PEDWARN : DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (ap); va_end (ap);
return ret; return ret;
} }
......
gcc/diagnostic.c
...@@ -1076,7 +1076,7 @@ diagnostic_impl (rich_location *richloc, int opt, ...@@ -1076,7 +1076,7 @@ diagnostic_impl (rich_location *richloc, int opt,
if (kind == DK_WARNING || kind == DK_PEDWARN) if (kind == DK_WARNING || kind == DK_PEDWARN)
diagnostic.option_index = opt; 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. */ /* 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, ...@@ -1092,7 +1092,7 @@ diagnostic_n_impl_richloc (rich_location *richloc, int opt, int n,
ap, richloc, kind); ap, richloc, kind);
if (kind == DK_WARNING) if (kind == DK_WARNING)
diagnostic.option_index = opt; 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 /* Implement inform_n, warning_n, and error_n, as documented and
......
gcc/diagnostic.h
...@@ -278,8 +278,6 @@ extern diagnostic_context *global_dc; ...@@ -278,8 +278,6 @@ extern diagnostic_context *global_dc;
(!(DC)->dc_inhibit_warnings \ (!(DC)->dc_inhibit_warnings \
&& !(in_system_header_at (LOC) && !(DC)->dc_warn_system_headers)) && !(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 /* Override the option index to be used for reporting a
diagnostic. */ diagnostic. */
#define diagnostic_override_option_index(DI, OPTIDX) \ #define diagnostic_override_option_index(DI, OPTIDX) \
......
gcc/fortran/ChangeLog
2017-05-05 David Malcolm <dmalcolm@redhat.com>
* cpp.c (cb_cpp_error): Replace report_diagnostic
with diagnostic_report_diagnostic.
* error.c (gfc_warning): Likewise.
(gfc_warning_now_at): Likewise.
(gfc_warning_now): Likewise.
(gfc_warning_internal): Likewise.
(gfc_error_now): Likewise.
(gfc_fatal_error): Likewise.
(gfc_error_opt): Likewise.
(gfc_internal_error): Likewise.
2017-05-01 Thomas Koenig <tkoenig@gcc.gnu.org> 2017-05-01 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/37131 PR fortran/37131
......
gcc/fortran/cpp.c
...@@ -1062,7 +1062,7 @@ cb_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason, ...@@ -1062,7 +1062,7 @@ cb_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
richloc, dlevel); richloc, dlevel);
if (reason == CPP_W_WARNING_DIRECTIVE) if (reason == CPP_W_WARNING_DIRECTIVE)
diagnostic_override_option_index (&diagnostic, OPT_Wcpp); diagnostic_override_option_index (&diagnostic, OPT_Wcpp);
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (level == CPP_DL_WARNING_SYSHDR) if (level == CPP_DL_WARNING_SYSHDR)
global_dc->dc_warn_system_headers = save_warn_system_headers; global_dc->dc_warn_system_headers = save_warn_system_headers;
return ret; return ret;
......
gcc/fortran/error.c
...@@ -789,7 +789,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap) ...@@ -789,7 +789,7 @@ gfc_warning (int opt, const char *gmsgid, va_list ap)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING); DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
bool ret = report_diagnostic (&diagnostic); bool ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
if (buffered_p) if (buffered_p)
{ {
...@@ -1138,7 +1138,7 @@ gfc_warning_now_at (location_t loc, int opt, const char *gmsgid, ...) ...@@ -1138,7 +1138,7 @@ gfc_warning_now_at (location_t loc, int opt, const char *gmsgid, ...)
va_start (argp, gmsgid); va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_WARNING); diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
return ret; return ret;
} }
...@@ -1157,7 +1157,7 @@ gfc_warning_now (int opt, const char *gmsgid, ...) ...@@ -1157,7 +1157,7 @@ gfc_warning_now (int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING); DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
return ret; return ret;
} }
...@@ -1176,7 +1176,7 @@ gfc_warning_internal (int opt, const char *gmsgid, ...) ...@@ -1176,7 +1176,7 @@ gfc_warning_internal (int opt, const char *gmsgid, ...)
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc,
DK_WARNING); DK_WARNING);
diagnostic.option_index = opt; diagnostic.option_index = opt;
ret = report_diagnostic (&diagnostic); ret = diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
return ret; return ret;
} }
...@@ -1194,7 +1194,7 @@ gfc_error_now (const char *gmsgid, ...) ...@@ -1194,7 +1194,7 @@ gfc_error_now (const char *gmsgid, ...)
va_start (argp, gmsgid); va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ERROR); diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ERROR);
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
} }
...@@ -1210,7 +1210,7 @@ gfc_fatal_error (const char *gmsgid, ...) ...@@ -1210,7 +1210,7 @@ gfc_fatal_error (const char *gmsgid, ...)
va_start (argp, gmsgid); va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_FATAL); diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_FATAL);
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
gcc_unreachable (); gcc_unreachable ();
...@@ -1295,7 +1295,7 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap) ...@@ -1295,7 +1295,7 @@ gfc_error_opt (int opt, const char *gmsgid, va_list ap)
} }
diagnostic_set_info (&diagnostic, gmsgid, &argp, &richloc, DK_ERROR); diagnostic_set_info (&diagnostic, gmsgid, &argp, &richloc, DK_ERROR);
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
if (buffered_p) if (buffered_p)
{ {
...@@ -1345,7 +1345,7 @@ gfc_internal_error (const char *gmsgid, ...) ...@@ -1345,7 +1345,7 @@ gfc_internal_error (const char *gmsgid, ...)
va_start (argp, gmsgid); va_start (argp, gmsgid);
diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ICE); diagnostic_set_info (&diagnostic, gmsgid, &argp, &rich_loc, DK_ICE);
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
va_end (argp); va_end (argp);
gcc_unreachable (); gcc_unreachable ();
......
gcc/rtl-error.c
...@@ -71,7 +71,7 @@ diagnostic_for_asm (const rtx_insn *insn, const char *msg, va_list *args_ptr, ...@@ -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, diagnostic_set_info (&diagnostic, msg, args_ptr,
&richloc, kind); &richloc, kind);
report_diagnostic (&diagnostic); diagnostic_report_diagnostic (global_dc, &diagnostic);
} }
void void
......
gcc/substring-locations.c
...@@ -150,7 +150,7 @@ format_warning_va (const substring_loc &fmt_loc, ...@@ -150,7 +150,7 @@ format_warning_va (const substring_loc &fmt_loc,
diagnostic_info diagnostic; diagnostic_info diagnostic;
diagnostic_set_info (&diagnostic, gmsgid, ap, &richloc, DK_WARNING); diagnostic_set_info (&diagnostic, gmsgid, ap, &richloc, DK_WARNING);
diagnostic.option_index = opt; 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) if (!err && fmt_substring_loc && !substring_within_range)
/* Case 2. */ /* Case 2. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment