From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id 77EED3856DD0; Tue, 10 May 2022 12:43:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77EED3856DD0 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pedro Alves To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Move non-dependent gdb::observers::observable::visit_state outside template X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: b773a1808d5ae1786cd62a985093cf3f9537f2e2 X-Git-Newrev: 62b33fde9c7ffd498af0236a50e200210807374a Message-Id: <20220510124304.77EED3856DD0@sourceware.org> Date: Tue, 10 May 2022 12:43:04 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 12:43:04 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D62b33fde9c7f= fd498af0236a50e200210807374a commit 62b33fde9c7ffd498af0236a50e200210807374a Author: Pedro Alves Date: Fri May 6 16:28:37 2022 +0100 Move non-dependent gdb::observers::observable::visit_state outside temp= late =20 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: =20 $ 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::VIS= ITED gdb::observers::observable::visit_state::VIS= ITING gdb::observers::observable::visit_state::NOT_VISITED gdb::observers::observable::visit_state::VISITED gdb::observers::observable::visit_state::VISITING gdb::observers::observable >::visi= t_state::NOT_VISITED gdb::observers::observable >::visi= t_state::VISITED gdb::observers::observable >::visi= t_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 ...] =20 $ grep VISIT gdb-index-symbol-names.txt | wc -l 72 =20 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: =20 $ du -b gdb.before gdb.after 164685280 gdb.before 163707424 gdb.fixed =20 and codesize by some 0.5%. =20 Change-Id: I405f4ef27b8358fdd22158245b145d849b45658e Diff: --- gdbsupport/observable.h | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) 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); }; =20 +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; =20 - /* 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. =20 Visit all dependencies of observer at INDEX in M_OBSERVERS (later ref= erred @@ -171,15 +179,16 @@ private: =20 If the observer is already visited, do nothing. */ void visit_for_sorting (std::vector &sorted_observers, - std::vector &visit_states, int inde= x) + std::vector &visit_states, + int index) { - if (visit_states[index] =3D=3D visit_state::VISITED) + if (visit_states[index] =3D=3D detail::visit_state::VISITED) return; =20 /* If we are already visiting this observer, it means there's a cycle.= */ - gdb_assert (visit_states[index] !=3D visit_state::VISITING); + gdb_assert (visit_states[index] !=3D detail::visit_state::VISITING); =20 - visit_states[index] =3D visit_state::VISITING; + visit_states[index] =3D detail::visit_state::VISITING; =20 /* For each dependency of this observer... */ for (const token *dep : m_observers[index].dependencies) @@ -195,7 +204,7 @@ private: } } =20 - visit_states[index] =3D visit_state::VISITED; + visit_states[index] =3D detail::visit_state::VISITED; sorted_observers.push_back (m_observers[index]); } =20 @@ -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); =20 for (size_t i =3D 0; i < m_observers.size (); i++) visit_for_sorting (sorted_observers, visit_states, i);