From patchwork Tue Feb 25 13:09:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 38301 Received: (qmail 114127 invoked by alias); 25 Feb 2020 13:09:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 114064 invoked by uid 89); 25 Feb 2020 13:09:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway36.websitewelcome.com Received: from gateway36.websitewelcome.com (HELO gateway36.websitewelcome.com) (192.185.198.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Feb 2020 13:09:36 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 3B88D408E8C7E for ; Tue, 25 Feb 2020 06:24:20 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 6Zxujv9vjRP4z6ZxujKAHS; Tue, 25 Feb 2020 07:09:34 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=sP76SHPdCQc7QU6R72tmMlToUgJuAqT3Kg8nZP/7wuo=; b=LwOchHFYjbjD+ytoaMHNzoRsTu K1hnYt7VXXxnPlTBah56Ucp3yRKcMvnN4CzJmiwiDh5th151Mcfor85wKp0sJgUBUVpAUOzleFulk 2nqfcQi4P7qIVZV6IphBdedvQ; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:55352 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j6Zxu-001C8N-3a; Tue, 25 Feb 2020 06:09:34 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/2] Remove casts from dwarf2/index-write.c Date: Tue, 25 Feb 2020 06:09:31 -0700 Message-Id: <20200225130932.6861-2-tom@tromey.com> In-Reply-To: <20200225130932.6861-1-tom@tromey.com> References: <20200225130932.6861-1-tom@tromey.com> dwarf2/index-write.c casts pointers to "dwarf2_psymtab *", but as far as I can tell, it does not actually use any DWARF-specific fields of the psymtab. So, this patch changes this code to use partial_symtab instead. This removes nearly every cast, leaving just the unavoidable one from addrmap iteration. gdb/ChangeLog 2020-02-25 Tom Tromey * dwarf2/index-write.c (psym_index_map): Change type. (add_address_entry_worker, write_one_signatured_type) (recursively_count_psymbols, recursively_write_psymbols) (class debug_names, psyms_seen_size, write_gdbindex) (write_debug_names): Use partial_symtab, not dwarf2_psymtab. --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2/index-write.c | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 2cbf2ebd202..4b711d0d29a 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -399,7 +399,7 @@ write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool) } } -typedef std::unordered_map psym_index_map; +typedef std::unordered_map psym_index_map; /* Helper struct for building the address table. */ struct addrmap_index_data @@ -439,7 +439,7 @@ static int add_address_entry_worker (void *datap, CORE_ADDR start_addr, void *obj) { struct addrmap_index_data *data = (struct addrmap_index_data *) datap; - dwarf2_psymtab *pst = (dwarf2_psymtab *) obj; + partial_symtab *pst = (partial_symtab *) obj; if (data->previous_valid) add_address_entry (data->objfile, data->addr_vec, @@ -582,7 +582,7 @@ write_one_signatured_type (void **slot, void *d) struct signatured_type_index_data *info = (struct signatured_type_index_data *) d; struct signatured_type *entry = (struct signatured_type *) *slot; - dwarf2_psymtab *psymtab = entry->per_cu.v.psymtab; + partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->symtab, info->psyms_seen, @@ -612,12 +612,12 @@ write_one_signatured_type (void **slot, void *d) if they appeared in this psymtab. */ static void -recursively_count_psymbols (dwarf2_psymtab *psymtab, +recursively_count_psymbols (partial_symtab *psymtab, size_t &psyms_seen) { for (int i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) - recursively_count_psymbols ((dwarf2_psymtab *) psymtab->dependencies[i], + recursively_count_psymbols (psymtab->dependencies[i], psyms_seen); psyms_seen += psymtab->n_global_syms; @@ -629,7 +629,7 @@ recursively_count_psymbols (dwarf2_psymtab *psymtab, static void recursively_write_psymbols (struct objfile *objfile, - dwarf2_psymtab *psymtab, + partial_symtab *psymtab, struct mapped_symtab *symtab, std::unordered_set &psyms_seen, offset_type cu_index) @@ -639,7 +639,7 @@ recursively_write_psymbols (struct objfile *objfile, for (i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) recursively_write_psymbols (objfile, - (dwarf2_psymtab *) psymtab->dependencies[i], + psymtab->dependencies[i], symtab, psyms_seen, cu_index); write_psymbols (symtab, @@ -869,14 +869,14 @@ public: as if they appeared in this psymtab. */ void recursively_write_psymbols (struct objfile *objfile, - dwarf2_psymtab *psymtab, + partial_symtab *psymtab, std::unordered_set &psyms_seen, int cu_index) { for (int i = 0; i < psymtab->number_of_dependencies; ++i) if (psymtab->dependencies[i]->user != NULL) recursively_write_psymbols - (objfile, (dwarf2_psymtab *) psymtab->dependencies[i], psyms_seen, cu_index); + (objfile, psymtab->dependencies[i], psyms_seen, cu_index); write_psymbols (psyms_seen, (objfile->partial_symtabs->global_psymbols.data () @@ -1234,7 +1234,7 @@ private: write_one_signatured_type (struct signatured_type *entry, struct signatured_type_index_data *info) { - dwarf2_psymtab *psymtab = entry->per_cu.v.psymtab; + partial_symtab *psymtab = entry->per_cu.v.psymtab; write_psymbols (info->psyms_seen, (info->objfile->partial_symtabs->global_psymbols.data () @@ -1320,7 +1320,7 @@ psyms_seen_size (struct dwarf2_per_objfile *dwarf2_per_objfile) size_t psyms_count = 0; for (dwarf2_per_cu_data *per_cu : dwarf2_per_objfile->all_comp_units) { - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; if (psymtab != NULL && psymtab->user == NULL) recursively_count_psymbols (psymtab, psyms_count); @@ -1423,7 +1423,7 @@ write_gdbindex (struct dwarf2_per_objfile *dwarf2_per_objfile, FILE *out_file, { struct dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->all_comp_units[i]; - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; /* CU of a shared file from 'dwz -m' may be unused by this main file. It may be referenced from a local scope but in such case it does not @@ -1508,7 +1508,7 @@ write_debug_names (struct dwarf2_per_objfile *dwarf2_per_objfile, for (int i = 0; i < dwarf2_per_objfile->all_comp_units.size (); ++i) { const dwarf2_per_cu_data *per_cu = dwarf2_per_objfile->all_comp_units[i]; - dwarf2_psymtab *psymtab = per_cu->v.psymtab; + partial_symtab *psymtab = per_cu->v.psymtab; /* CU of a shared file from 'dwz -m' may be unused by this main file. It may be referenced from a local scope but in such