diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2023-11-14 14:02:10 -0500 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2023-11-14 14:02:10 -0500 |
| commit | 353f146cebbf224520de1bdfa8e43ceba868cf62 (patch) | |
| tree | 7a48c2ae51b0a964ce2348a4f99aa9c73717043a /gcc/c-family/c-warn.cc | |
| parent | 07e568d77f364e833193dd6f7b3170b28b1e52db (diff) | |
| download | gcc-353f146cebbf224520de1bdfa8e43ceba868cf62.zip gcc-353f146cebbf224520de1bdfa8e43ceba868cf62.tar.gz gcc-353f146cebbf224520de1bdfa8e43ceba868cf62.tar.bz2 | |
diagnostics: make option-handling callbacks private
No functional change intended.
gcc/c-family/ChangeLog:
* c-warn.cc (conversion_warning): Update call to
global_dc->m_option_enabled to use option_enabled_p.
gcc/cp/ChangeLog:
* decl.cc (finish_function): Update call to
global_dc->m_option_enabled to use option_enabled_p.
gcc/ChangeLog:
* diagnostic-format-json.cc
(json_output_format::on_end_diagnostic): Update calls to m_context
callbacks to use member functions; tighten up scopes.
* diagnostic-format-sarif.cc (sarif_builder::make_result_object):
Likewise.
(sarif_builder::make_reporting_descriptor_object_for_warning):
Likewise.
* diagnostic.cc (diagnostic_context::initialize): Update for
callbacks being moved into m_option_callbacks and being renamed.
(diagnostic_context::set_option_hooks): New.
(diagnostic_option_classifier::classify_diagnostic): Update call
to global_dc->m_option_enabled to use option_enabled_p.
(diagnostic_context::print_option_information): Update calls to
m_context callbacks to use member functions; tighten up scopes.
(diagnostic_context::diagnostic_enabled): Likewise.
* diagnostic.h (diagnostic_option_enabled_cb): New typedef.
(diagnostic_make_option_name_cb): New typedef.
(diagnostic_make_option_url_cb): New typedef.
(diagnostic_context::option_enabled_p): New.
(diagnostic_context::make_option_name): New.
(diagnostic_context::make_option_url): New.
(diagnostic_context::set_option_hooks): New decl.
(diagnostic_context::m_option_enabled): Rename to
m_option_enabled_cb and move within m_option_callbacks, using
typedef.
(diagnostic_context::m_option_state): Move within
m_option_callbacks.
(diagnostic_context::m_option_name): Rename to
m_make_option_name_cb and move within m_option_callbacks, using
typedef.
(diagnostic_context::m_get_option_url): Likewise, renaming to
m_make_option_url_cb.
* lto-wrapper.cc (print_lto_docs_link): Update call to m_context
callback to use member function.
(main): Use diagnostic_context::set_option_hooks.
* opts-diagnostic.h (option_name): Make context param const.
(get_option_url): Likewise.
* opts.cc (option_name): Likewise.
(get_option_url): Likewise.
* toplev.cc (general_init): Use
diagnostic_context::set_option_hooks.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'gcc/c-family/c-warn.cc')
| -rw-r--r-- | gcc/c-family/c-warn.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/c-family/c-warn.cc b/gcc/c-family/c-warn.cc index b1bd8ba..d2938b9 100644 --- a/gcc/c-family/c-warn.cc +++ b/gcc/c-family/c-warn.cc @@ -1350,9 +1350,7 @@ conversion_warning (location_t loc, tree type, tree expr, tree result) break; if (arith_ops - && global_dc->m_option_enabled (warnopt, - global_dc->m_lang_mask, - global_dc->m_option_state)) + && global_dc->option_enabled_p (warnopt)) { for (int i = 0; i < arith_ops; ++i) { |