From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QdRfO7P8nGn38QcAWB0awg (envelope-from ) for ; Mon, 23 Feb 2026 20:19:48 -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=DFw4q2yw; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EB9F81E0BA; Mon, 23 Feb 2026 20:19:47 -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 60DC91E08D for ; Mon, 23 Feb 2026 20:19:47 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id F2FC54BA23DD for ; Tue, 24 Feb 2026 01:19:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2FC54BA23DD 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=DFw4q2yw Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id BB4184BA23EF for ; Tue, 24 Feb 2026 01:17:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB4184BA23EF 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 BB4184BA23EF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771895822; cv=none; b=SMWy/V91XG8Y5ebryejMT0DsHssxAiC1GeLewLRESg/firbGxqgtlpc7RniPFCIh68SwOABfVuyttfysr7+TYQyKv2Cs+IPq3hdOBQBn8pXX3OZ7EX1gWSx9cU8muCi6qGvSJ7r5310pnmALkeercQRf0jkMnnZdOeDMUe8L73Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771895822; c=relaxed/simple; bh=hxwJS3g3rxO5a+1h4b1CDJxH3clgg4jIAOvjEodPH2A=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=HeGn9gMsnVHz4+FXvTLWTExdWFwCZW32x9QKCkjEe6SyRjwtO1ENxoIRbQFdabmudyhoDF3rW+HR3fjyzV5H9Tqydrc6MFHP9yCAvVH+k5SUYpLopRRJj0liS+DosvUp5tOs3FSqXB8lGUGnJjy3Pg8OYHzxjbHZl6WQ39HAw4M= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB4184BA23EF Received: from eig-obgw-6006b.ext.cloudfilter.net ([10.0.30.211]) by cmsmtp with ESMTPS id udyFvbCWzKjfouh2qvSHgb; Tue, 24 Feb 2026 01:17:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uh2ovFE2ovXvHuh2pvo9Sd; Tue, 24 Feb 2026 01:16:59 +0000 X-Authority-Analysis: v=2.4 cv=e4IGSbp/ c=1 sm=1 tr=0 ts=699cfc0b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=ItBw4LHWJt0A:10 a=PaXOg6dQYAskeado_NEA: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=LmRrvQYGS/Dmj/o1JiqUv92MwJiDa0dNEedhOavMbJY=; b=DFw4q2ywfouF7K51ShEZql2IGh elWi0wBOmmhslUZWR80nKqUp+IZcuXm5fHAWtp3gH13ntg3mHlBWoBjb8FxIoypIL8doQ94k29jr8 tXnq8NK4RBTuPyhun19IyZu/B; Received: from 97-122-122-234.hlrn.qwest.net ([97.122.122.234]:51428 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 1vuh2o-00000000sJg-375E; Mon, 23 Feb 2026 18:16:58 -0700 From: Tom Tromey Date: Mon, 23 Feb 2026 18:16:57 -0700 Subject: [PATCH v4 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: <20260223-dw-inline-fixup-pr-symtab-30728-2-v4-4-bf923dc5fb19@tromey.com> References: <20260223-dw-inline-fixup-pr-symtab-30728-2-v4-0-bf923dc5fb19@tromey.com> In-Reply-To: <20260223-dw-inline-fixup-pr-symtab-30728-2-v4-0-bf923dc5fb19@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.122.234 X-Source-L: No X-Exim-ID: 1vuh2o-00000000sJg-375E X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-122-234.hlrn.qwest.net ([192.168.122.1]) [97.122.122.234]:51428 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOVa7IjLx86G2NMMH6GwiVRO9AEU0S+pzGJBZdt8B8qZBUSKpyYAs/3DmyYzpEoRANfNptHHqNIFOeSAhFVkqW+hOknQQeCuZ0zx/fldFS8JO403K2Cn DdAL5wrCcoZIIUmgnyrX9gxaJczbLgHNsks5JfrBc076NxQ9Cche3mUd396s7ARCJiGLKLda150w9wYh2yDfYWq4N0OrBZ9jj18= 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 2cbdd7c6dc8..5917e697aad 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -14192,25 +14192,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