From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by sourceware.org (Postfix) with ESMTPS id F2C243858C2D for ; Fri, 6 May 2022 16:35:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F2C243858C2D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f47.google.com with SMTP id 125-20020a1c1983000000b003941f354c62so4693559wmz.0 for ; Fri, 06 May 2022 09:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5RvAox+//Bo3eSG6mh+C6PMSlHHuKBVVixnZhrnwfuE=; b=pc3nHJS3BL/0uduCQMd4ZWiWFnF9ZTK4hNDgatim9N3lLHo5D+lS5ppbKA2R+B8xuh DVviOW1Y+AnkYDuRSNqEZiEhXjVUrGsOh8JGGWP5Qfsc3L5qDIWEvIs31VwNTTMgMeaR gsfVrdlRyKDZhBS/aW0CRvSgtix3I2TRZAFfxf1avRytm5cyC3SYBsdWvyp6Qed/eweR aHrM1FMHyAlVCxo0qoA+dTsY6fjs3dKcdPgMcu18a4YUjALqHmLEk+hzxtW8JnVb/zbP 4nzDcKQXIh1WFdRjl1wBM3Jao0E5Mbj4QHtyXy6tO6YulwGXAqbJSO2ltRXQk//oWlDp GX9A== X-Gm-Message-State: AOAM532vS5IDq8ktVBttZrXn5FaaUjfbrOyfV6ZHHR22Ngt8QJX0qTuY s+4L4xkB+2GAoUBKqO5EYvv2fJkhX5c= X-Google-Smtp-Source: ABdhPJxaSHynZ0/leKpMxJYb2VQxuZ9NF5Qic7pSLxGiyA+t8QVdsFdDb1Epd+sZ2ow3rNbw0yP1Aw== X-Received: by 2002:a05:600c:b46:b0:394:30df:b95e with SMTP id k6-20020a05600c0b4600b0039430dfb95emr4082974wmr.25.1651854919080; Fri, 06 May 2022 09:35:19 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id l2-20020adff482000000b0020c5253d91csm4076551wro.104.2022.05.06.09.35.17 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 May 2022 09:35:18 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH] Move non-dependent gdb::observers::observable::visit_state outside template Date: Fri, 6 May 2022 17:35:16 +0100 Message-Id: <20220506163516.35194-1-pedro@palves.net> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 16:35:22 -0000 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 --- 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); }; +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 @@ class observable 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 @@ class observable 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 @@ class observable } } - visit_states[index] = visit_state::VISITED; + visit_states[index] = detail::visit_state::VISITED; sorted_observers.push_back (m_observers[index]); } @@ -207,8 +216,8 @@ class observable 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); base-commit: 0ee8858e7aeca5ba5f702204daad2ddd290ef229 -- 2.36.0