From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D9F663858CDA for ; Thu, 1 Dec 2022 15:40:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9F663858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669909215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=x+694ATs9XVxQg+cIINjTyMNCH9BJ1YhLZAYGPQJ5b4=; b=GWL8AMua2be1dhGhPgX5Bm1DVpvuNMU6NgvGNCtMip81tHpTRXgQEDNeNNSxQC+pUsnYUS ghWvJGiD4UlxHn8Y4jYa6+wUt9noUJymjkULqi9bUWGDUL/imGT6AVY0fZNmGGj2fPDWCg sY0vUIymFiuGVrvqx44Jt5nmIYyNPJc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-600-LyviBaHDMf6x_7iaVUWYCg-1; Thu, 01 Dec 2022 10:40:12 -0500 X-MC-Unique: LyviBaHDMf6x_7iaVUWYCg-1 Received: by mail-wm1-f72.google.com with SMTP id p14-20020a05600c204e00b003cf4cce4da5so847852wmg.0 for ; Thu, 01 Dec 2022 07:40:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x+694ATs9XVxQg+cIINjTyMNCH9BJ1YhLZAYGPQJ5b4=; b=nLhlQNK4XnO5Fw+0T0p6zIPbGUqYkL1TVDQL1s1ggX24R2RZ+U1/HHR+5qooLb662F 176nuN59LqrMmwlElAU178qzJbD992IYcF8XYs/AyLtRnJHOmTIdHyKypguCPyYXa/xT toJuL40tPG1og9x56vRH0Bo7XgMf5aik1I64MlDghYXxwBm/Q5QeKljFGogJtlp/Vs5s KB60Scm+rDqpioAA0zF1djKXSMpXABMd6t/HBTMrlI1MT4S8ZXNmOVsXNVv1BMhXAl5s 1uGBu4nnctvCUlRP+Uk1YkBLBfyy/VRMrivwehRitwKbK6PVCZ0CVJpau4+BvPgAO+B7 CLNQ== X-Gm-Message-State: ANoB5pmHXvJJfvRsbNWwSvwCuDA1WWKE3mTRFPkk3D5L+Ah6kjgMGq5G Lhcg5HSV406la2V+fh1cr2BgBqI3TRZ8uJP8a75HQZj69o7MgkZjFu3kOuSJV5sgQ0AJ32yUSGs akd/h2qTaog9JTmg8IFJvpDip3rmTadb7uro6veheNmyX/pQ/Ox4J8tpI3umiu+g0wS5RQvSmSw == X-Received: by 2002:a05:6000:a05:b0:242:1836:c955 with SMTP id co5-20020a0560000a0500b002421836c955mr1228440wrb.37.1669908881793; Thu, 01 Dec 2022 07:34:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf7dDlR9Bp6ZYZiimmTWxShvc9nrxc5coCZV6gYEEHs+ejTTGIj+7hYY3nadG0ECLLsmEI9Ruw== X-Received: by 2002:a05:6000:a05:b0:242:1836:c955 with SMTP id co5-20020a0560000a0500b002421836c955mr1228429wrb.37.1669908881515; Thu, 01 Dec 2022 07:34:41 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c35cb00b003a84375d0d1sm10359428wmq.44.2022.12.01.07.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:34:41 -0800 (PST) From: Andrew Burgess To: Tom Tromey via Gdb-patches , gdb-patches@sourceware.org Cc: Tom Tromey Subject: Re: [PATCH 2/3] Refactor cooked_index::do_finalize In-Reply-To: <20221107162356.3175221-3-tromey@adacore.com> References: <20221107162356.3175221-1-tromey@adacore.com> <20221107162356.3175221-3-tromey@adacore.com> Date: Thu, 01 Dec 2022 15:34:40 +0000 Message-ID: <87edtj16jz.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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 List-Id: Tom Tromey via Gdb-patches writes: > 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. LGTM. Thanks, Andrew > --- > 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 (); > -- > 2.34.3