From patchwork Sun Nov 5 18:11:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79093 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 4B3CC38618B7 for ; Sun, 5 Nov 2023 18:13:08 +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 C8DE5385735A for ; Sun, 5 Nov 2023 18:11:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C8DE5385735A 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 C8DE5385735A 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=1699207895; cv=none; b=OxW90AYHyp0ORj8loBWg4QUcc7tnTZQfA+i2VivMeDaNWDnYdv4ChEYw2Dt/41ZWBqW0WHCuRjH5pAQdIhecefaCewKwdDFvcNHiTFkf93SQoCYXhgVA6KHH/gW2Pe9ln87I3N/OUMKz9V1VZQit5j05ETNO9dp97L5kexIXVVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207895; c=relaxed/simple; bh=hk8dsyb7/5eFZjI99rFo4wMF+ghyAlvsj0hBGgY6bHo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=U+ZFSSTkZGdevw0RMkhrnq2HlWX33BYfkUS+EBKSd6W0mqzYaPUhv2dq+ci/6IbQYCjMOn8j36IksMje4kxS3cl9etCGNNc297ODlGkMIph/w7vtMU7o/4AdTV5rb05dBz3U7yyb2xjuLS5nAvuRK/uC3zWFQbZdUW7+JKmE6zQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5002a.ext.cloudfilter.net ([10.0.29.215]) by cmsmtp with ESMTPS id zdgIqA2txgpyEzhavq8IME; Sun, 05 Nov 2023 18:11:33 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhavqkL3CF1O4zhavqlfn0; Sun, 05 Nov 2023 18:11:33 +0000 X-Authority-Analysis: v=2.4 cv=CcwbWZnl c=1 sm=1 tr=0 ts=6547dad5 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=eRxpThcnFnfATnHW0x4A: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=cQdWg+92jPpRx25wXvYWQnapYI4V1SYBzuB3Bx7S/kg=; b=U3GYzLnOgvjQXOdMcIk35iA473 A2/2tPVAB9oT0DhBnVaqsUfYEFQoe9LXfTuehbBF9feIyk22nKk7JFVJMKRgHdTnRe47D8/6spFbs lftjIHXbBKH3scUwJ4Gz3+6uG; 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 1qzhau-003Y66-2V for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:32 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:56 -0700 Subject: [PATCH v2 18/31] Change evaluate_var_value to accept a block_symbol MIME-Version: 1.0 Message-Id: <20231105-split-objfile-2023-bound-sym-october-v2-18-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: 1qzhau-003Y66-2V 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: 19 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfBfdANfYQu1MW2ka8OpMZDwlb65kHwXeXlLU2Y+uxrmssMDFacHIpfx17DnnLEpQsyK5b3EFsULpdjuqcKi0W42ASPPOlACjFTLQAJ7u1RNQrW2br+ve KHDVBdkGWmj5JqW1LbQuCutTHESeMujgyHmB8KgMg/ed4IAhUaUlkp1oMVjGPCL8uaF87pWpkRtjSZUg61jh7zG3j2Fg7m+pmfs= 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_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 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 change evaluate_var_value to accept a block_symbol, preparing some code to use the new read_var_value overload. --- gdb/ada-lang.c | 4 +--- gdb/eval.c | 20 ++++++++------------ gdb/value.h | 3 +-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 03f405778e6..ef7864b6770 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10813,9 +10813,7 @@ ada_var_value_operation::evaluate_for_cast (struct type *expect_type, struct expression *exp, enum noside noside) { - value *val = evaluate_var_value (noside, - std::get<0> (m_storage).block, - std::get<0> (m_storage).symbol); + value *val = evaluate_var_value (noside, std::get<0> (m_storage)); val = ada_value_cast (expect_type, val); diff --git a/gdb/eval.c b/gdb/eval.c index ba09599b28a..0f5e3c18a05 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -517,7 +517,7 @@ type_instance_operation::evaluate (struct type *expect_type, /* Helper for evaluating an OP_VAR_VALUE. */ value * -evaluate_var_value (enum noside noside, const block *blk, symbol *var) +evaluate_var_value (enum noside noside, block_symbol var) { /* JYG: We used to just return value::zero of the symbol type if we're asked to avoid side effects. Otherwise we return @@ -532,7 +532,7 @@ evaluate_var_value (enum noside noside, const block *blk, symbol *var) try { - ret = value_of_variable (var, blk); + ret = value_of_variable (var.symbol, var.block); } catch (const gdb_exception_error &except) @@ -540,7 +540,7 @@ evaluate_var_value (enum noside noside, const block *blk, symbol *var) if (noside != EVAL_AVOID_SIDE_EFFECTS) throw; - ret = value::zero (var->type (), not_lval); + ret = value::zero (var.symbol->type (), not_lval); } return ret; @@ -558,7 +558,7 @@ var_value_operation::evaluate (struct type *expect_type, symbol *var = std::get<0> (m_storage).symbol; if (var->type ()->code () == TYPE_CODE_ERROR) error_unknown_type (var->print_name ()); - return evaluate_var_value (noside, std::get<0> (m_storage).block, var); + return evaluate_var_value (noside, std::get<0> (m_storage)); } } /* namespace expr */ @@ -700,8 +700,7 @@ var_value_operation::evaluate_funcall (struct type *expect_type, if (symp.symbol->type ()->code () == TYPE_CODE_ERROR) error_unknown_type (symp.symbol->print_name ()); - value *callee = evaluate_var_value (noside, std::get<0> (m_storage).block, - symp.symbol); + value *callee = evaluate_var_value (noside, symp); return evaluate_subexp_do_call (exp, noside, callee, argvec, nullptr, expect_type); @@ -1108,7 +1107,7 @@ eval_op_func_static_var (struct type *expect_type, struct expression *exp, struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL); if (sym.symbol == NULL) error (_("No symbol \"%s\" in specified context."), var); - return evaluate_var_value (noside, sym.block, sym.symbol); + return evaluate_var_value (noside, sym); } /* Helper function that implements the body of OP_REGISTER. */ @@ -2326,8 +2325,7 @@ adl_func_operation::evaluate (struct type *expect_type, nullptr, &symp, nullptr, 0, noside); if (symp.symbol->type ()->code () == TYPE_CODE_ERROR) error_unknown_type (symp.symbol->print_name ()); - value *callee = evaluate_var_value (noside, std::get<1> (m_storage), - symp.symbol); + value *callee = evaluate_var_value (noside, symp); return evaluate_subexp_do_call (exp, noside, callee, args, nullptr, expect_type); @@ -2854,9 +2852,7 @@ var_value_operation::evaluate_for_cast (struct type *to_type, struct expression *exp, enum noside noside) { - value *val = evaluate_var_value (noside, - std::get<0> (m_storage).block, - std::get<0> (m_storage).symbol); + value *val = evaluate_var_value (noside, std::get<0> (m_storage)); val = value_cast (to_type, val); diff --git a/gdb/value.h b/gdb/value.h index 6f0b61a853d..37c07a41205 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -1344,8 +1344,7 @@ extern int using_struct_return (struct gdbarch *gdbarch, struct value *function, struct type *value_type); -extern value *evaluate_var_value (enum noside noside, const block *blk, - symbol *var); +extern value *evaluate_var_value (enum noside noside, block_symbol var); extern value *evaluate_var_msym_value (enum noside noside, struct objfile *objfile,