From patchwork Sun Nov 5 18:11:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79089 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 E2C9C3850867 for ; Sun, 5 Nov 2023 18:12:49 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 28DA23857717 for ; Sun, 5 Nov 2023 18:11:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 28DA23857717 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 28DA23857717 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207894; cv=none; b=BtXx/jAxQbeYmIrsSBnvIIW2ilasruayQD7eVRDBWsV8V5zl+MLGCKxIs/TktgEoclM7ALyySOmPvtbrzqpPSktXb3Kq64S5AD3MlT4oQBCUP+5UnYiNOFLJ7nNsowf8MRekNFREbDGVyqurGZcMUyoOaCeX7f6XbRtfW9K+vjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207894; c=relaxed/simple; bh=DPvThK9Hi8lJ3cDNv8l1mdVMIC/SwfsF7LcMAIBkbkQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=IgcXBZ7ZvCMFgBKGXTkpJeReqdb/6abki7ltbbiutw8qqZtJ0UDJDGgjvXVVcnkUaPDX9BXVtBOega9F9U4A0hZldfViD8BEHSU8gjVSQ2vKOCnJE/uOhphGsHvBwRx+I+QeHsrpcmaxKVzWC0MrlHNzTyK0ZDEW0Q2sYp90fS0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id zZYaqLvGIL9AgzhauqXSuD; Sun, 05 Nov 2023 18:11:32 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhatquCLX1wVhzhatqoHfz; Sun, 05 Nov 2023 18:11:31 +0000 X-Authority-Analysis: v=2.4 cv=ANu0s8gj c=1 sm=1 tr=0 ts=6547dad3 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=vdn_P9uBLAvIqKZbNcQA: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=q2Vlx3e2jSIOMCiEsZm7xt3crHc7RzpftVTxddlFXrE=; b=EWVnquZslu0sQuzByHCWD1zaP/ AQWQEsn4VE/9J8Hgs9/2z/VO6hqpNI7pxYY3KRUjP/u6LOgfiwcTShLyf5IfkxoQYGXuG3zO14euD 549XPSj48fOojUIjKQTzyiuXT; 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 1qzhat-003Y66-0L for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:31 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:48 -0700 Subject: [PATCH v2 10/31] Use block_symbol::address in linespec.c MIME-Version: 1.0 Message-Id: <20231105-split-objfile-2023-bound-sym-october-v2-10-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: 1qzhat-003Y66-0L 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: 11 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfBKowoemwiWUqOYbqOeCtLITNp/ZZ+SlzjdFED5sYwg9zk4bcCCwnE9WRVWK3xVTMgdybcwe9tbg+sE+8xnnVPukQKhF+7BBnIhNiYyFsKcOcmx63bqF agT5Y3HN/MQwgKnVIzami+COoC3w6D8gA3bFuQtj0x47uD+tA7RC7xWRxPVHScPq/LlpqBnTBPNUkR+T5JtTTA6FSJ3upSFeOK8= X-Spam-Status: No, score=-3024.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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 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 linespec.c to use block_symbol::address. --- gdb/linespec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index fa733d880e3..a118a20cade 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -383,7 +383,7 @@ static struct line_offset const char *variable); static int symbol_to_sal (struct symtab_and_line *result, - int funfirstline, struct symbol *sym); + int funfirstline, block_symbol sym); static void add_matching_symbols_to_info (const char *name, symbol_name_match_type name_match_type, @@ -2187,7 +2187,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) struct program_space *pspace = sym.symbol->symtab ()->compunit ()->objfile ()->pspace; - if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) + if (symbol_to_sal (&sal, state->funfirstline, sym) && maybe_add_address (state->addr_set, pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, sym.symbol->natural_name (), 0); @@ -2252,7 +2252,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) if (!found_ifunc) { symtab_and_line sal; - if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) + if (symbol_to_sal (&sal, state->funfirstline, sym) && maybe_add_address (state->addr_set, pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, sym.symbol->natural_name (), 0); @@ -4358,8 +4358,9 @@ add_matching_symbols_to_info (const char *name, static int symbol_to_sal (struct symtab_and_line *result, - int funfirstline, struct symbol *sym) + int funfirstline, block_symbol bsym) { + symbol *sym = bsym.symbol; if (sym->aclass () == LOC_BLOCK) { *result = find_function_start_sal (sym, funfirstline); @@ -4367,13 +4368,13 @@ symbol_to_sal (struct symtab_and_line *result, } else { - if (sym->aclass () == LOC_LABEL && sym->value_address () != 0) + if (sym->aclass () == LOC_LABEL && bsym.address () != 0) { *result = {}; result->symtab = sym->symtab (); result->symbol = sym; result->line = sym->line (); - result->pc = sym->value_address (); + result->pc = bsym.address (); result->pspace = result->symtab->compunit ()->objfile ()->pspace; result->explicit_pc = 1; return 1; @@ -4389,7 +4390,7 @@ symbol_to_sal (struct symtab_and_line *result, result->symtab = sym->symtab (); result->symbol = sym; result->line = sym->line (); - result->pc = sym->value_address (); + result->pc = bsym.address (); result->pspace = result->symtab->compunit ()->objfile ()->pspace; return 1; }