From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id C10EB3858410 for ; Thu, 18 Jan 2024 20:32:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C10EB3858410 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 C10EB3858410 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705609942; cv=none; b=XOC0UYiznJxZdcJWh0N3iJnbZhI7dNAkatbZMCc+vRgom7jeRPGUAK/bXsxST+fY3oSoV5LQZRkiFWzmz+c4Zh0bJFkO4wfN0nQDEE/ezb4wcsKG5ulmGqyoIwIyO683MAFyISoYoGudpi1huy9uDyw764X2H2jVyxf9tQODhPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705609942; c=relaxed/simple; bh=BRR1cAuGkCaa6TfpUWmKsUtTiNUBE8QZn5gsTaylwoQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=AXAv0dIlipbSPfBtoAXVeEugiZRiiJMSD0teRt6C4E+SJKqdCVF49GFd378aLZPiZjbdm44IJX9Uq9wu2iP3fOWBY3/L1+LDbhs4N5JuJOd1lzqiiz+4eql8pq6C7HQLyimuPHZr5B5SxLIcNpRWaVDQS0d2fFMxi6GcFfqw5ww= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id QYpHracYP80oiQZ3dr0O8I; Thu, 18 Jan 2024 20:32:13 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id QZ3crjZMffPByQZ3crj6MB; Thu, 18 Jan 2024 20:32:12 +0000 X-Authority-Analysis: v=2.4 cv=T+af8tGQ c=1 sm=1 tr=0 ts=65a98acc a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=erOdZxmXbWm6VKJsYvcA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=CJJAFlCKkXkZQ2UXPhAVv4SW0X37Os7TpHu3fx6dN0M=; b=QlGqSnxMtZHRUWKJIsOEFtMBjx YKmsG9QJx2X6hEaZMMB4oktdkP9BTidTECw3+IDl+U6f/c+dyeXfrN/+p1RkfU+JmEJ+8NgdzsqO3 Reu95tTGK3LUWUCRzlCIuzSsA; Received: from 97-122-68-157.hlrn.qwest.net ([97.122.68.157]:50746 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rQZ3c-002DCj-0c for gdb-patches@sourceware.org; Thu, 18 Jan 2024 13:32:12 -0700 From: Tom Tromey Date: Thu, 18 Jan 2024 13:32:17 -0700 Subject: [PATCH v2 19/30] Remove old symbol_matches_domain MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240118-submit-domain-hacks-2-v2-19-aecab29fa104@tromey.com> References: <20240118-submit-domain-hacks-2-v2-0-aecab29fa104@tromey.com> In-Reply-To: <20240118-submit-domain-hacks-2-v2-0-aecab29fa104@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 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.68.157 X-Source-L: No X-Exim-ID: 1rQZ3c-002DCj-0c X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-68-157.hlrn.qwest.net ([192.168.0.21]) [97.122.68.157]:50746 X-Source-Auth: tom+tromey.com X-Email-Count: 21 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfCNDDLYGE4STEO/YNi2fhQrw8k0M2KGgugSd352owN9H7j6H9PlRjT7xmsylByyhTfDHjVMovkv9sEOaJll2KGdt4aepBUpTy87b2oGrSWZWy27HpnI1 gNZhY7wQ3SsElVmV2dKHFkovKkdMh4+Wg1F3KpkCyp4d71A19tmWwL5ncIIEGpeRBnlmRQqmXEVOrUQbnxRgyyOdkNCo/gL+8Jk= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: Nothing calls the variant of symbol_matches_domain that accepts a domain_enum for searching, so this patch removes it and the corresponding symbol::matches. --- gdb/symtab.c | 20 -------------------- gdb/symtab.h | 11 ----------- 2 files changed, 31 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 5735786ac44..b8588355921 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2676,26 +2676,6 @@ lookup_global_symbol (const char *name, return bs; } -bool -symbol_matches_domain (enum language symbol_language, - domain_enum symbol_domain, - domain_enum domain) -{ - /* For C++ "struct foo { ... }" also defines a typedef for "foo". - Similarly, any Ada type declaration implicitly defines a typedef. */ - if (symbol_language == language_cplus - || symbol_language == language_d - || symbol_language == language_ada - || symbol_language == language_rust) - { - if ((domain == VAR_DOMAIN || domain == STRUCT_DOMAIN) - && symbol_domain == STRUCT_DOMAIN) - return true; - } - /* For all other languages, strict match is required. */ - return (symbol_domain == domain); -} - /* See symtab.h. */ bool diff --git a/gdb/symtab.h b/gdb/symtab.h index 340ad170ece..8624006746d 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1242,10 +1242,6 @@ enum symbol_subclass_kind extern gdb::array_view symbol_impls; -bool symbol_matches_domain (enum language symbol_language, - domain_enum symbol_domain, - domain_enum domain); - /* This structure is space critical. See space comments at the top. */ struct symbol : public general_symbol_info, public allocate_on_obstack @@ -1292,13 +1288,6 @@ struct symbol : public general_symbol_info, public allocate_on_obstack return this->impl ().aclass; } - /* Call symbol_matches_domain on this symbol, using the symbol's - domain. */ - bool matches (domain_enum d) const - { - return symbol_matches_domain (language (), domain (), d); - } - /* Return true if this symbol's domain matches FLAGS. */ bool matches (domain_search_flags flags) const; -- 2.43.0