From patchwork Mon Nov 7 16:23:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 60133 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 037E23857C69 for ; Mon, 7 Nov 2022 16:25:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 037E23857C69 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667838334; bh=rIwM3Oy7dnJ4ELTlEjCTY9I/paqnNchjNIdj7llaALA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=bDayXnyNYf+5gloJ3t8AOPUcspmwLVk4X471ZQz8Jt2OJzCyGKERNGo1yKmWbXTSK gnZ66Kvu1RYCr3v6ioaNLuzjyRszT1ZhrbXqBx1mB6AW+Scsl76n54iqu8sg03It7N BuRAQOovi03cOaUnjjSB47YZcCelIeXxnS2SnJGM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 368373858C33 for ; Mon, 7 Nov 2022 16:24:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 368373858C33 Received: by mail-il1-x135.google.com with SMTP id q5so6087076ilt.13 for ; Mon, 07 Nov 2022 08:24:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rIwM3Oy7dnJ4ELTlEjCTY9I/paqnNchjNIdj7llaALA=; b=ANpUwLN5NRvBf2vYgGtR7gdx4HZP5Fi9j+cSZPfSlhu1iLXLgplzpZI/fNooKufQ2x qiaafowLQGQQEpyHrY6hNpQRuIyQmCYiXkUyVIXS5NQUhDhqbGiBuDkHZ7xsW3yek0ZY 7sCA7Cb2NLfyZz7rANUdMS3wJefDUCzocsO37jnXcNXtn2xU+Xi8Dv9l41YI9y1vN391 8h+FgcjpTN+nlMf8mpc9sQsQ0FKGjqgErg3xP5KnBUFZhM0VKOHQ4uPKKtUBXzMqCafB AhqzUO1miLro2JBGgoQOcsrdt9jNb88x8spP1SEw4g/xeRo2TDLIqhQW24gfwXbOrNRL 9wzg== X-Gm-Message-State: ANoB5plbSRj7+b4Jzq2f0ccp9kD7cCyxcC98NF/5NBMr0iLYjWydh+8h 4kZXBVTyBIDsVoJ3pH6RzIHq6JL1Vwyg1g== X-Google-Smtp-Source: AA0mqf69k0ILhD6xWAfZcRHESx4Vg78GY3sBwL2wEhgPvK0PHk7HmTfPoBq2H3grbD5HkT9oZvdopA== X-Received: by 2002:a05:6e02:1c03:b0:302:1034:845 with SMTP id l3-20020a056e021c0300b0030210340845mr3953415ilh.292.1667838249409; Mon, 07 Nov 2022 08:24:09 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id i12-20020a023b4c000000b003750aa3c5c1sm2790492jaf.31.2022.11.07.08.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 08:24:09 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/3] Refactor cooked_index::do_finalize Date: Mon, 7 Nov 2022 09:23:55 -0700 Message-Id: <20221107162356.3175221-3-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20221107162356.3175221-1-tromey@adacore.com> References: <20221107162356.3175221-1-tromey@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This refactors cooked_index::do_finalize, reordering an 'if' to make it a little less redundant. This change makes a subsequent patch easier to read. --- gdb/dwarf2/cooked-index.c | 49 ++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index adb0046609e..a580d549d0d 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -196,16 +196,28 @@ cooked_index::do_finalize () for (cooked_index_entry *entry : m_entries) { gdb_assert (entry->canonical == nullptr); - if ((entry->per_cu->lang () != language_cplus - && entry->per_cu->lang () != language_ada) - || (entry->flags & IS_LINKAGE) != 0) + if ((entry->flags & IS_LINKAGE) != 0) entry->canonical = entry->name; - else + else if (entry->per_cu->lang () == language_ada) { - if (entry->per_cu->lang () == language_ada) + gdb::unique_xmalloc_ptr canon_name + = handle_gnat_encoded_entry (entry, gnat_entries.get ()); + if (canon_name == nullptr) + entry->canonical = entry->name; + else + { + entry->canonical = canon_name.get (); + m_names.push_back (std::move (canon_name)); + } + } + else if (entry->per_cu->lang () == language_cplus) + { + void **slot = htab_find_slot (seen_names.get (), entry, + INSERT); + if (*slot == nullptr) { gdb::unique_xmalloc_ptr canon_name - = handle_gnat_encoded_entry (entry, gnat_entries.get ()); + = cp_canonicalize_string (entry->name); if (canon_name == nullptr) entry->canonical = entry->name; else @@ -216,28 +228,13 @@ cooked_index::do_finalize () } else { - void **slot = htab_find_slot (seen_names.get (), entry, - INSERT); - if (*slot == nullptr) - { - gdb::unique_xmalloc_ptr canon_name - = cp_canonicalize_string (entry->name); - if (canon_name == nullptr) - entry->canonical = entry->name; - else - { - entry->canonical = canon_name.get (); - m_names.push_back (std::move (canon_name)); - } - } - else - { - const cooked_index_entry *other - = (const cooked_index_entry *) *slot; - entry->canonical = other->canonical; - } + const cooked_index_entry *other + = (const cooked_index_entry *) *slot; + entry->canonical = other->canonical; } } + else + entry->canonical = entry->name; } m_names.shrink_to_fit ();