From patchwork Sun Nov 5 18:11:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79092 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 979D0385F022 for ; Sun, 5 Nov 2023 18:13:05 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id 6B7FC3856DD5 for ; Sun, 5 Nov 2023 18:11:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6B7FC3856DD5 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 6B7FC3856DD5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207896; cv=none; b=ugB+vtAAVnQ3I+UIFERUV0Zvl+5HdTzbXGSwHJtrs/KBztzvcbhoRh2AfcKlk6A3LrPHYJHyXDn/sYewwC4D/Jq1EfSxLbwTr29gHN79pWnLJpHWxe7HQUmFiZHBF+3mijTHXE/r9JvgGD178GIv7+wl9EaShw+yQoUDSPke3MI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207896; c=relaxed/simple; bh=wuOSoAgE9uvBXMcJPkG0oUF2px9EDqP4jtc9t4+KMxo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Xp/DnXa2Mm+Im7DDa0wTQNGFR1uYjN68i5r7rEmDwFyziGjxB3SS9uut6DQrj841NYwoCCYURblUrAJbnb8TtwoQz9fO8JSS/eDE3JOsQhk9LJd9zh6CXU/dxaq/MWQy4FY8Zf/zaRjT/5WM5Vp/W9Utv0MtAJmDO/HM6CD1O5A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5001a.ext.cloudfilter.net ([10.0.29.139]) by cmsmtp with ESMTPS id zfMkqbUOoWcCIzhawqQWwO; Sun, 05 Nov 2023 18:11:34 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhavqkEnD5OjYzhawqSHt7; Sun, 05 Nov 2023 18:11:34 +0000 X-Authority-Analysis: v=2.4 cv=ep/Mc6lX c=1 sm=1 tr=0 ts=6547dad6 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=5DTYeCrgOUQH4HF58esA: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=ns/4Uv+2DoPHPTEExCyHn855+J0hzG2Nd+3VNvIC9nc=; b=TP2JVCXF0CYHf4M/UV/SRQLDhE 0qd3+a9hVSvz6Z3XYdgnYAE6N5v9NZmQeO+b51L7hr9zEC5zEEUqsACcHokNdIClpq2fCphcRqItq AUPJDzLjApRJVppoeRR/E0Tmw; 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 1qzhav-003Y66-1G for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:33 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:59 -0700 Subject: [PATCH v2 21/31] Use read_var_value overload in return_command MIME-Version: 1.0 Message-Id: <20231105-split-objfile-2023-bound-sym-october-v2-21-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: 1qzhav-003Y66-1G 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: 22 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfI65lgmV4ccDMepf90gnyzF/aH926R11kzkTOzel5r6Pi1du38VJ2mDCRw4XVKpQaky6Uz8m8En6qDXLbdX14nA6rQuUF/dciO7Y2WN+EzK4l9QWGqWK DDgfUtTqTjKiXKoGnNsRO9yaD2IyeA3F2P4FKHlXQESw5KREFkCACYS/mtWSEB4h9hhR1Kbnry1cBcVaA3PWGL+pie0GTX9NvLs= 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, 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 return_command to use the new read_var_value overload. --- gdb/stack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/stack.c b/gdb/stack.c index a2ea7301394..f744baad61a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2692,7 +2692,8 @@ return_command (const char *retval_exp, int from_tty) std::string query_prefix; thisframe = get_selected_frame ("No selected frame."); - thisfun = get_frame_function (thisframe).symbol; + block_symbol b_fun = get_frame_function (thisframe); + thisfun = b_fun.symbol; gdbarch = get_frame_arch (thisframe); if (get_frame_type (get_current_frame ()) == INLINE_FRAME) @@ -2733,7 +2734,7 @@ return_command (const char *retval_exp, int from_tty) return_value->fetch_lazy (); if (thisfun != NULL) - function = read_var_value (thisfun, NULL, thisframe); + function = read_var_value (b_fun, thisframe); rv_conv = RETURN_VALUE_REGISTER_CONVENTION; if (return_type->code () == TYPE_CODE_VOID)