From: Pedro Alves Date: Fri, 6 May 2022 15:28:37 +0000 (+0100) Subject: Move non-dependent gdb::observers::observable::visit_state outside template X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62b33fde9c7ffd498af0236a50e200210807374a;p=binutils-gdb.git Move non-dependent gdb::observers::observable::visit_state outside template The other day, while looking at the symbols that end up in a GDB index, I noticed that the gdb::observers::observable::visit_state enum class appears a number of times: $ grep VISIT gdb-index-symbol-names.txt gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable >::visit_state::NOT_VISITED gdb::observers::observable >::visit_state::VISITED gdb::observers::observable >::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING [... snip ...] $ grep VISIT gdb-index-symbol-names.txt | wc -l 72 enum class visit_state is defined inside the class template observable, but it doesn't have to be, as it does not depend on the template parameters. This commit moves it out, so that only one such type exists. This reduces the size of a -O0 -g3 build for me by around 0.6%, like so: $ du -b gdb.before gdb.after 164685280 gdb.before 163707424 gdb.fixed and codesize by some 0.5%. Change-Id: I405f4ef27b8358fdd22158245b145d849b45658e --- diff --git a/gdbsupport/observable.h b/gdbsupport/observable.h index a58e23dbcff..c7475e523ef 100644 --- a/gdbsupport/observable.h +++ b/gdbsupport/observable.h @@ -62,6 +62,22 @@ struct token DISABLE_COPY_AND_ASSIGN (token); }; +namespace detail +{ + /* Types that don't depend on any template parameter. This saves a + bit of code and debug info size, compared to putting them inside + class observable. */ + + /* Use for sorting algorithm, to indicate which observer we have + visited. */ + enum class visit_state + { + NOT_VISITED, + VISITING, + VISITED, + }; +} + template class observable { @@ -156,14 +172,6 @@ private: std::vector m_observers; const char *m_name; - /* Use for sorting algorithm, to indicate which observer we have visited. */ - enum class visit_state - { - NOT_VISITED, - VISITING, - VISITED, - }; - /* Helper method for topological sort using depth-first search algorithm. Visit all dependencies of observer at INDEX in M_OBSERVERS (later referred @@ -171,15 +179,16 @@ private: If the observer is already visited, do nothing. */ void visit_for_sorting (std::vector &sorted_observers, - std::vector &visit_states, int index) + std::vector &visit_states, + int index) { - if (visit_states[index] == visit_state::VISITED) + if (visit_states[index] == detail::visit_state::VISITED) return; /* If we are already visiting this observer, it means there's a cycle. */ - gdb_assert (visit_states[index] != visit_state::VISITING); + gdb_assert (visit_states[index] != detail::visit_state::VISITING); - visit_states[index] = visit_state::VISITING; + visit_states[index] = detail::visit_state::VISITING; /* For each dependency of this observer... */ for (const token *dep : m_observers[index].dependencies) @@ -195,7 +204,7 @@ private: } } - visit_states[index] = visit_state::VISITED; + visit_states[index] = detail::visit_state::VISITED; sorted_observers.push_back (m_observers[index]); } @@ -207,8 +216,8 @@ private: void sort_observers () { std::vector sorted_observers; - std::vector visit_states (m_observers.size (), - visit_state::NOT_VISITED); + std::vector visit_states + (m_observers.size (), detail::visit_state::NOT_VISITED); for (size_t i = 0; i < m_observers.size (); i++) visit_for_sorting (sorted_observers, visit_states, i);