diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2020-01-30 16:38:35 -0500 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2020-01-30 19:24:06 -0500 |
| commit | ebe9174e940c94e99cd688a05309833ae64a998b (patch) | |
| tree | 9deb6cf932b3cf1ef2d6a91c0c25ba134200537c /gcc/analyzer | |
| parent | bba54d62af59c957b8a4d2f31de21a4c56a2e323 (diff) | |
| download | gcc-ebe9174e940c94e99cd688a05309833ae64a998b.zip gcc-ebe9174e940c94e99cd688a05309833ae64a998b.tar.gz gcc-ebe9174e940c94e99cd688a05309833ae64a998b.tar.bz2 | |
analyzer: make extrinsic_state field private
gcc/analyzer/ChangeLog:
* diagnostic-manager.cc (for_each_state_change): Use
extrinsic_state::get_num_checkers rather than accessing m_checkers
directly.
* program-state.cc (program_state::program_state): Likewise.
* program-state.h (extrinsic_state::m_checkers): Make private.
Diffstat (limited to 'gcc/analyzer')
| -rw-r--r-- | gcc/analyzer/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/analyzer/diagnostic-manager.cc | 6 | ||||
| -rw-r--r-- | gcc/analyzer/program-state.cc | 4 | ||||
| -rw-r--r-- | gcc/analyzer/program-state.h | 1 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index 1c981e4..9f24206 100644 --- a/gcc/analyzer/ChangeLog +++ b/gcc/analyzer/ChangeLog @@ -1,5 +1,13 @@ 2020-01-30 David Malcolm <dmalcolm@redhat.com> + * diagnostic-manager.cc (for_each_state_change): Use + extrinsic_state::get_num_checkers rather than accessing m_checkers + directly. + * program-state.cc (program_state::program_state): Likewise. + * program-state.h (extrinsic_state::m_checkers): Make private. + +2020-01-30 David Malcolm <dmalcolm@redhat.com> + PR analyzer/93356 * region-model.cc (region_model::eval_condition): In both overloads, bail out immediately on floating-point types. diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc index eb1fa05..023fda9 100644 --- a/gcc/analyzer/diagnostic-manager.cc +++ b/gcc/analyzer/diagnostic-manager.cc @@ -684,10 +684,10 @@ for_each_state_change (const program_state &src_state, state_change_visitor *visitor) { gcc_assert (src_state.m_checker_states.length () - == ext_state.m_checkers.length ()); + == ext_state.get_num_checkers ()); gcc_assert (dst_state.m_checker_states.length () - == ext_state.m_checkers.length ()); - for (unsigned i = 0; i < ext_state.m_checkers.length (); i++) + == ext_state.get_num_checkers ()); + for (unsigned i = 0; i < ext_state.get_num_checkers (); i++) { const state_machine &sm = ext_state.get_sm (i); const sm_state_map &src_smap = *src_state.m_checker_states[i]; diff --git a/gcc/analyzer/program-state.cc b/gcc/analyzer/program-state.cc index f41f105..ead62a5 100644 --- a/gcc/analyzer/program-state.cc +++ b/gcc/analyzer/program-state.cc @@ -535,9 +535,9 @@ sm_state_map::validate (const state_machine &sm, program_state::program_state (const extrinsic_state &ext_state) : m_region_model (new region_model ()), - m_checker_states (ext_state.m_checkers.length ()) + m_checker_states (ext_state.get_num_checkers ()) { - int num_states = ext_state.m_checkers.length (); + int num_states = ext_state.get_num_checkers (); for (int i = 0; i < num_states; i++) m_checker_states.quick_push (new sm_state_map ()); } diff --git a/gcc/analyzer/program-state.h b/gcc/analyzer/program-state.h index 0a4e35f..a052c6e 100644 --- a/gcc/analyzer/program-state.h +++ b/gcc/analyzer/program-state.h @@ -45,6 +45,7 @@ public: unsigned get_num_checkers () const { return m_checkers.length (); } +private: /* The state machines. */ auto_delete_vec <state_machine> &m_checkers; }; |