From patchwork Wed Feb 1 18:45:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64118 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABC3A3858401 for ; Wed, 1 Feb 2023 18:45:35 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id BC6283858D33 for ; Wed, 1 Feb 2023 18:45:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC6283858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 137631004BBA7 for ; Wed, 1 Feb 2023 18:45:21 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id NI6ipmthcx5dfNI6ipTqTA; Wed, 01 Feb 2023 18:45:21 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=R+nGpfdX c=1 sm=1 tr=0 ts=63dab341 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=evFXbwmFS_PkCYcJ4SAA:9 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=e3fDGytZFj/1WPXn5gdVoHMEiMOzje/FsqOXIPZZXas=; b=gIq63FJ1XgCKL1WArAIBz2OsCT al+JRhIvQRn3PHdd2HuAHl8S4Nyb52O+6edyvdsnQCKfdpM6KPyzpwOTkEQ3wWqOVT4uqMI6jU3WY xUGnCd8x5kpqhET4yI1P1vWJi; Received: from 71-211-157-143.hlrn.qwest.net ([71.211.157.143]:44816 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pNI6i-000D3x-IE; Wed, 01 Feb 2023 11:45:20 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Simplify checks of cooked_index Date: Wed, 1 Feb 2023 11:45:09 -0700 Message-Id: <20230201184509.3499301-1-tom@tromey.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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.157.143 X-Source-L: No X-Exim-ID: 1pNI6i-000D3x-IE X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-157-143.hlrn.qwest.net (localhost.localdomain) [71.211.157.143]:44816 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes the cooked_index_functions to avoid an extra null check now that checked_static_cast allows a null argument. --- gdb/dwarf2/read.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index ee4e7c1530a..bbbf8ad1816 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18634,11 +18634,11 @@ dwarf2_per_cu_data * cooked_index_functions::find_per_cu (dwarf2_per_bfd *per_bfd, CORE_ADDR adjusted_pc) { - if (per_bfd->index_table == nullptr) - return nullptr; cooked_index *table = (gdb::checked_static_cast (per_bfd->index_table.get ())); + if (table == nullptr) + return nullptr; return table->lookup (adjusted_pc); } @@ -18650,13 +18650,13 @@ cooked_index_functions::find_compunit_symtab_by_address return nullptr; dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); - if (per_objfile->per_bfd->index_table == nullptr) - return nullptr; - - CORE_ADDR baseaddr = objfile->data_section_offset (); cooked_index *table = (gdb::checked_static_cast (per_objfile->per_bfd->index_table.get ())); + if (table == nullptr) + return nullptr; + + CORE_ADDR baseaddr = objfile->data_section_offset (); dwarf2_per_cu_data *per_cu = table->lookup (address - baseaddr); if (per_cu == nullptr) return nullptr; @@ -18673,8 +18673,12 @@ cooked_index_functions::expand_matching_symbols symbol_compare_ftype *ordered_compare) { dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); - if (per_objfile->per_bfd->index_table == nullptr) + cooked_index *table + = (gdb::checked_static_cast + (per_objfile->per_bfd->index_table.get ())); + if (table == nullptr) return; + const block_search_flags search_flags = (global ? SEARCH_GLOBAL_BLOCK : SEARCH_STATIC_BLOCK); @@ -18682,9 +18686,6 @@ cooked_index_functions::expand_matching_symbols symbol_name_matcher_ftype *name_match = lang->get_symbol_name_matcher (lookup_name); - cooked_index *table - = (gdb::checked_static_cast - (per_objfile->per_bfd->index_table.get ())); for (const cooked_index_entry *entry : table->all_entries ()) { QUIT; @@ -18713,12 +18714,13 @@ cooked_index_functions::expand_symtabs_matching enum search_domain kind) { dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); - if (per_objfile->per_bfd->index_table == nullptr) - return true; cooked_index *table = (gdb::checked_static_cast (per_objfile->per_bfd->index_table.get ())); + if (table == nullptr) + return true; + table->wait (); dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher);