From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id od4mKJned2l/rRYAWB0awg (envelope-from ) for ; Mon, 26 Jan 2026 16:37:29 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=YDUl2/8G; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9E5DF1E0DD; Mon, 26 Jan 2026 16:37:29 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 181731E089 for ; Mon, 26 Jan 2026 16:37:29 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id AE45A4BC7EE0 for ; Mon, 26 Jan 2026 21:37:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE45A4BC7EE0 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=YDUl2/8G Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 1A45E4BA9031 for ; Mon, 26 Jan 2026 21:33:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A45E4BA9031 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1A45E4BA9031 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769463211; cv=none; b=DhPUObxffdCKSJ3ojdz78BgzOx+GugwflKr7Guy3ribv1jCRZtZDUIjXTMXq2tFc+JsNHNztcLdddJxmQE6m0gkL7+nkd8hPWi5kx+DwumCNMYGPWvkre6Zf8Oop9atspYtqQ6WkG0bQUyu7wFtU+lOYwvLkUOG7cScoXl1PysQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769463211; c=relaxed/simple; bh=q+LJMJ0BjyD9He2CKqFjVQSgGt/pO6Fk8+GtS6pmUgE=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=JaHhKMBjJgjMCLLEThCo5b4ZdrzwdLmBCOmNIWSAn+IxOu0BRH9meITyfhTJW95+kjNuxiOVXXd6HVLv1dK3rAE7MgRE6BtVIFp7Yz/3sMa9V73FFU7jaIrn3VRmRfKMG9iJ268aBDoRKgbK1ll8I3A2mo9SnKfVo2Xs0/InV6I= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A45E4BA9031 Received: from eig-obgw-5005b.ext.cloudfilter.net ([10.0.29.189]) by cmsmtp with ESMTPS id kOFvvdBZhipkCkUDCvlswR; Mon, 26 Jan 2026 21:33:30 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id kUDBvY1N2jAxukUDBviO8j; Mon, 26 Jan 2026 21:33:29 +0000 X-Authority-Analysis: v=2.4 cv=EoDSrTcA c=1 sm=1 tr=0 ts=6977dda9 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=ItBw4LHWJt0A:10 a=FPiJxlyZKuyE8EtJ9AgA:9 a=QEXdDO2ut3YA:10 a=DCx65vhANUyCzuf5D8fC:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aAAWwrQF4i35hrdgJK0alEgDPwU8TRAo7EbrjxPikO0=; b=YDUl2/8Gf0lUfohKZhABDo4FEb 2HfyPH5kQVuR+BerzNgbBatThbscFj8EeEYCq3AKabB0M6aLHHuMSzQHVAjnXG4JPRDKjuzdTRsGH 0C4+5fWTVcmadrPZ4LAwnkoVr; Received: from 97-122-114-32.hlrn.qwest.net ([97.122.114.32]:44294 helo=[192.168.122.1]) by box5379.bluehost.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vkUDB-00000003cBe-12LI; Mon, 26 Jan 2026 14:33:29 -0700 From: Tom Tromey Date: Mon, 26 Jan 2026 14:33:06 -0700 Subject: [PATCH v2 4/8] Combine two cases in cooked_index_functions::search MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260126-dw-inline-fixup-pr-symtab-30728-2-v2-4-8ab183d1911c@tromey.com> References: <20260126-dw-inline-fixup-pr-symtab-30728-2-v2-0-8ab183d1911c@tromey.com> In-Reply-To: <20260126-dw-inline-fixup-pr-symtab-30728-2-v2-0-8ab183d1911c@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.114.32 X-Source-L: No X-Exim-ID: 1vkUDB-00000003cBe-12LI X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-114-32.hlrn.qwest.net ([192.168.122.1]) [97.122.114.32]:44294 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfIx/OFZYa1lVZcVcSGJR2i5bpjVMwc9wT8KvUIlwvbxNmA8YM7jZgTxL1q9QURY7rn0luWeMAE+XZwVxkknbVV+EvKlzMID93Bk/De0Zew57RWNrIHsF 0qC0p+e3/8vfsnuhy/1OyiJCZIGBTr0EiNYSF20/2RRM8e7PbRVdZQOgPrZYLtA0GQzTv2NNbGDa+TWyKNNbwRVDjwuXI4z/Vbc= X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This combines a couple of 'if' statements in cooked_index_functions::search. This simplifies the code a little and also makes a subsequent patch a bit simpler as well. --- gdb/dwarf2/read.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index b8f758ae8c7..8f2608b4607 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -14236,25 +14236,22 @@ cooked_index_functions::search || !entry->matches (domain)) continue; - if (lang_matcher != nullptr) + /* If LANG_MATCHER is non-NULL, try to skip CUs with a + non-matching language. The other case here is a bit of a + hack to support .gdb_index. Since .gdb_index does not + record languages, and since we want to know the language + to avoid excessive CU expansion due to false matches, if + we see a symbol with an unknown language we find the CU's + language. Only the .gdb_index reader creates such + symbols. */ + enum language entry_lang = entry->lang; + if (lang_matcher != nullptr || entry_lang == language_unknown) { - /* Try to skip CUs with non-matching language. */ entry->per_cu->ensure_lang (per_objfile); - if (!entry->per_cu->maybe_multi_language () + if (lang_matcher != nullptr + && !entry->per_cu->maybe_multi_language () && !lang_matcher (entry->per_cu->lang ())) continue; - } - - /* This is a bit of a hack to support .gdb_index. Since - .gdb_index does not record languages, and since we want - to know the language to avoid excessive CU expansion due - to false matches, if we see a symbol with an unknown - language we find the CU's language. Only the .gdb_index - reader creates such symbols. */ - enum language entry_lang = entry->lang; - if (entry_lang == language_unknown) - { - entry->per_cu->ensure_lang (per_objfile); entry_lang = entry->per_cu->lang (); } -- 2.49.0