From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id E3441385840F for ; Sun, 5 Nov 2023 18:11:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3441385840F 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 E3441385840F 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=1699207892; cv=none; b=d1zvJTlZA6FchzDzK6awiR9rEyOGh1rLgpvYpFgppVFRBWecXyPje7dbwhySVGYqhGguzHX01jRxbr+YH93/O4znO8Bmm7kQLgIXJ8WeWrZuTUx60qUeedMoKj7fF8CgUl/DLKSI6ofGJooQfV8BIsuwkeqdZgEL0i0CzktWYEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207892; c=relaxed/simple; bh=Nht1fDzR4ofSwyGQ9r2PEczWIk9PRSbi2q+HJo2/8oo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Vh/ZouItwJIteG66JoG+c9/eQ17X1v5xDIWeUQVoAiHuycgEVzSrAv5L+fJ42NEuLNp4WLly8MzvwowtGXm1nN9N2/tQS97kyr+DkdreREpXxRCVf59OaTTLdY6ES8m7JhofupLkL7y34JXMdNioPNtXpDCnoIruPY5K5rlNw4I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5005a.ext.cloudfilter.net ([10.0.29.234]) by cmsmtp with ESMTPS id zbh1q9neugpyEzhasq8ILU; Sun, 05 Nov 2023 18:11:30 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zharq3hbZTiJWzhasqpQsy; Sun, 05 Nov 2023 18:11:30 +0000 X-Authority-Analysis: v=2.4 cv=IpgNzZzg c=1 sm=1 tr=0 ts=6547dad2 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=BNY50KLci1gA: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=dLDFelPRowsqZbtQaJqJ2zpQEi qrmJDjgzrB1Zz8t0nCq7W4IDS/RDBQcLA7tYM7ycFuOJIww8Z5eBs4AsPHvypmsEaQBBFQroJmFxf PuMCuMpARGVLhUpSZrq0JX1en; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:51014 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 1qzhar-003Y66-1R for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:29 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:42 -0700 Subject: [PATCH v2 04/31] Easy conversions to use block_symbol::address MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231105-split-objfile-2023-bound-sym-october-v2-4-dbd2d158bbc3@tromey.com> References: <20231105-split-objfile-2023-bound-sym-october-v2-0-dbd2d158bbc3@tromey.com> In-Reply-To: <20231105-split-objfile-2023-bound-sym-october-v2-0-dbd2d158bbc3@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: 1qzhar-003Y66-1R 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]:51014 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEAa3eUzkpfjeJEtTBXjXLnM4X3pUA5yhQfJDvZ6FoiOplhDgqnwplDbOWK/zIEWLyMR3k0um4Jjd2Udo+OEp9Zxs/MjeuJM0A5B/20mIVIVKqcg+hk+ OahzxL7+Ztw3cZlkrz5EpgY8NMBdNY50NLroLOVvCza28bdDWIKd8UeMxw4QaOjMon//kLzyyxINFxRVWz3JEQRN5BUYxSA8GyY= 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,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: 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)), -- 2.41.0