From patchwork Sun Oct 29 23:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78698 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 847B43875470 for ; Sun, 29 Oct 2023 23:23:30 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id 78DE23861856 for ; Sun, 29 Oct 2023 23:23:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78DE23861856 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 78DE23861856 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621789; cv=none; b=vrmpyHRvIcb4QotCB8aBCgRQuHanOFDm6eq73V7yw5batYHm78zhhjGRLrou8RGI783T++iPQPGjCAGxRIQBZU+L9QTfS6kYRJ2A43D6N1UmkErHlh1GCR9KIorvfJh8a3axU80VBpf4N3BS0h6AMdUmKQCFUOmcYIAfmMFfJqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621789; c=relaxed/simple; bh=Nht1fDzR4ofSwyGQ9r2PEczWIk9PRSbi2q+HJo2/8oo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=rmyJwgIwEqjhyXHwwMvLb4IH1c+9Eugj/PXLT385YbaXpgMy88tIgGOj5Ohp1qd8ugzWNje7Z7ZbmuRsPYNw39MDUus+5WmLLxwc4boRq7V90ZH6RIBB20uphNNVVoDac9lHTAN4ipsn347Buoda1081hX4BJeT8nh1Z7kdlmX4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTPS id xBxKqhrQmgpyExF7bqEF9d; Sun, 29 Oct 2023 23:23:07 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id xF7aq09rf6uHPxF7aq1akR; Sun, 29 Oct 2023 23:23:06 +0000 X-Authority-Analysis: v=2.4 cv=TuH1ORbh c=1 sm=1 tr=0 ts=653ee95a a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=bhdUkHdE2iEA:10 a=Qbun_eYptAEA:10 a=tfeAfrXyRAfakcOlqI8A: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=0tw6mgwP8GerFCq4Q6jz6TVlAjWN2MPDr/vnTsB+sGw=; b=v7r8HOh7vstV6BrSPscOXpa+D5 xRml75pNlhp4MKuLRJCB7WytQk0ZFxIl4SO5sxQp1Jo/6gKg7n4L/NeSZOc2FVSlGSDescGEXL6Uw QUe9SKtHaWO/UJPV9ComY/7g3; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:56344 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 1qxF7a-0042zY-08 for gdb-patches@sourceware.org; Sun, 29 Oct 2023 17:23:06 -0600 From: Tom Tromey Date: Sun, 29 Oct 2023 17:23:24 -0600 Subject: [PATCH 03/30] Easy conversions to use block_symbol::address MIME-Version: 1.0 Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-3-612531df2734@tromey.com> References: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@tromey.com> In-Reply-To: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@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.77.73 X-Source-L: No X-Exim-ID: 1qxF7a-0042zY-08 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net ([192.168.0.21]) [97.122.77.73]:56344 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfIxLKgt1mK0NZfQyR9wMB9sn1WEAZn9k2pIVQHLbTMQRtqw9drIkawx93QV9AxBGO1ouPeLC40U5/kXCTjps0XlAvpDALOjoJAcpAs8FTxiuGCEWLoxj pCtKmaPhhhlI0uS12UCLGqY8NzPTmZ1WYTp6js8+dAaFDUSymVfXlE2AituqUMNqaST3Ry086vb9PvDq3tKx7SaTdWvryzcm9nE= X-Spam-Status: No, score=-3023.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_STOCKGEN, 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.30 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 This changes a few obvious spots to use block_symbol::address. --- gdb/ada-lang.c | 3 +-- gdb/compile/compile-c-symbols.c | 4 ++-- gdb/compile/compile-cplus-symbols.c | 4 ++-- gdb/compile/compile-cplus-types.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 9bb649e901d..3391aaeccb3 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5101,8 +5101,7 @@ remove_extra_symbols (std::vector &syms) syms[j].symbol->linkage_name ()) == 0 && (syms[i].symbol->aclass () == syms[j].symbol->aclass ()) - && syms[i].symbol->value_address () - == syms[j].symbol->value_address ()) + && syms[i].address () == syms[j].address ()) remove_p = true; } } diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 5982178170c..2d49ead249e 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -88,7 +88,7 @@ convert_one_symbol (compile_c_instance *context, case LOC_LABEL: kind = GCC_C_SYMBOL_LABEL; - addr = sym.symbol->value_address (); + addr = sym.address (); break; case LOC_BLOCK: @@ -179,7 +179,7 @@ convert_one_symbol (compile_c_instance *context, case LOC_STATIC: kind = GCC_C_SYMBOL_VARIABLE; - addr = sym.symbol->value_address (); + addr = sym.address (); break; case LOC_FINAL_VALUE: diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c index 1edbf8f64b5..dec0260bf7a 100644 --- a/gdb/compile/compile-cplus-symbols.c +++ b/gdb/compile/compile-cplus-symbols.c @@ -82,7 +82,7 @@ convert_one_symbol (compile_cplus_instance *instance, case LOC_LABEL: kind = GCC_CP_SYMBOL_LABEL; - addr = sym.symbol->value_address (); + addr = sym.address (); break; case LOC_BLOCK: @@ -175,7 +175,7 @@ convert_one_symbol (compile_cplus_instance *instance, case LOC_STATIC: kind = GCC_CP_SYMBOL_VARIABLE; - addr = sym.symbol->value_address (); + addr = sym.address (); break; case LOC_FINAL_VALUE: diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index ac27e83618b..53a98b432f4 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -627,7 +627,7 @@ compile_cplus_convert_struct_or_union_members const char *filename = sym.symbol->symtab ()->filename; unsigned int line = sym.symbol->line (); - physaddr = sym.symbol->value_address (); + physaddr = sym.address (); instance->plugin ().build_decl ("field physname", field_name, (GCC_CP_SYMBOL_VARIABLE| get_field_access_flag (type, i)),