From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway21.websitewelcome.com (gateway21.websitewelcome.com [192.185.45.36]) by sourceware.org (Postfix) with ESMTPS id 1BD8C3858C27 for ; Thu, 1 Apr 2021 01:05:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1BD8C3858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 9157B400E6CCF for ; Wed, 31 Mar 2021 20:05:37 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id RlmDlnbhIMGeERlmDlPPIg; Wed, 31 Mar 2021 20:05:37 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=98w9TbwyxgSTeGA3pauv/XVjAkrQMn/ziSe1sYq2vU8=; b=nSXSKWvfIBiHAoAafrRpO3pAlH 9v1PZvDqgjez3On1rnzc1KPLDW7+q3FVJHWhbCqELTifXuqABpNtpUdCTIeS9TffYudU8Xg9Qi5oz 2NvzyGdEKtJoZavN1nwmx71Ye; Received: from 71-211-182-15.hlrn.qwest.net ([71.211.182.15]:36150 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lRlmD-001gpL-Bn; Wed, 31 Mar 2021 19:05:37 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Remove two trivial functions from dwarf2/read.c Date: Wed, 31 Mar 2021 19:05:35 -0600 Message-Id: <20210401010535.796849-1-tom@tromey.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 71.211.182.15 X-Source-L: No X-Exim-ID: 1lRlmD-001gpL-Bn X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-182-15.hlrn.qwest.net (localhost.localdomain) [71.211.182.15]:36150 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 01 Apr 2021 01:05:39 -0000 This removes dw2_map_matching_symbols and dw2_expand_symtabs_matching, merging them with their sole trivial callers. gdb/ChangeLog 2021-03-31 Tom Tromey * dwarf2/read.c (dwarf2_gdb_index::map_matching_symbols): Merge with dw2_map_matching_symbols. (dwarf2_gdb_index::expand_symtabs_matching): Merge with dw2_expand_symtabs_matching. --- gdb/ChangeLog | 7 +++++++ gdb/dwarf2/read.c | 45 ++++++++++----------------------------------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 24183014cf4..a83c5f94d54 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3837,8 +3837,8 @@ dw2_expand_symtabs_matching_one gdb::function_view file_matcher, gdb::function_view expansion_notify); -static void -dw2_map_matching_symbols +void +dwarf2_gdb_index::map_matching_symbols (struct objfile *objfile, const lookup_name_info &name, domain_enum domain, int global, @@ -3895,18 +3895,6 @@ dw2_map_matching_symbols } } -void -dwarf2_gdb_index::map_matching_symbols - (struct objfile *objfile, - const lookup_name_info &name, domain_enum domain, - int global, - gdb::function_view callback, - symbol_compare_ftype *ordered_compare) -{ - dw2_map_matching_symbols (objfile, name, domain, global, callback, - ordered_compare); -} - /* Starting from a search name, return the string that finds the upper bound of all strings that start with SEARCH_NAME in a sorted name list. Returns the empty string to indicate that the upper bound is @@ -4858,14 +4846,14 @@ dw_expand_symtabs_matching_file_matcher } } -static void -dw2_expand_symtabs_matching - (struct objfile *objfile, - gdb::function_view file_matcher, - const lookup_name_info *lookup_name, - gdb::function_view symbol_matcher, - gdb::function_view expansion_notify, - enum search_domain kind) +void +dwarf2_gdb_index::expand_symtabs_matching + (struct objfile *objfile, + gdb::function_view file_matcher, + const lookup_name_info *lookup_name, + gdb::function_view symbol_matcher, + gdb::function_view expansion_notify, + enum search_domain kind) { dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); @@ -4899,19 +4887,6 @@ dw2_expand_symtabs_matching }, per_objfile); } -void -dwarf2_gdb_index::expand_symtabs_matching - (struct objfile *objfile, - gdb::function_view file_matcher, - const lookup_name_info *lookup_name, - gdb::function_view symbol_matcher, - gdb::function_view expansion_notify, - enum search_domain kind) -{ - dw2_expand_symtabs_matching (objfile, file_matcher, lookup_name, - symbol_matcher, expansion_notify, kind); -} - /* A helper for dw2_find_pc_sect_compunit_symtab which finds the most specific symtab. */ -- 2.26.2