From patchwork Sun Oct 29 23:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78718 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 1BFD33831E0D for ; Sun, 29 Oct 2023 23:25:04 +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 61F583861931 for ; Sun, 29 Oct 2023 23:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 61F583861931 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 61F583861931 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=1698621795; cv=none; b=kyODrmFiY5WZx101c9HvMuImEfhdfTgc8HX363/OlaLFp9dlzIlP3uOJbmPxGLgOUupgzZ+V4hQ+l3zJu6wRkyO96qFMrYHs+LhwxpuZ8/JVvaAseG3VEWFgg/qqZrl+AtlDU+AAxdZ6pnLtwsY+SPO0b8tUi1kJYGq+SQljIgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621795; c=relaxed/simple; bh=g4oYJLSoVVeOGmMjd74D2TcDi1aiDKR5N8XYwgBwcTg=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=vep8WtDrWLyI5wehBMijBgRAZ5zcKpdWqlmZcOOe8SXTzvYdHnkLlJa29/1SmjxpMYA4CHe5+nx62CisafhAf+ZcinuDFwWXVZKVj1uPvtFiMbCH+QDvCpw+mn48MRW3qHXxHsINE4fGuPfIa3ZFoNYatizJYgFQ3vQBQ1K/Pis= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6008a.ext.cloudfilter.net ([10.0.30.227]) by cmsmtp with ESMTPS id weEmqdrptgpyExF7eqEFAI; Sun, 29 Oct 2023 23:23:10 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id xF7cqdyYq79UBxF7dqNZaR; Sun, 29 Oct 2023 23:23:09 +0000 X-Authority-Analysis: v=2.4 cv=YqEc+qUX c=1 sm=1 tr=0 ts=653ee95d 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=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=1fbHp/0Mffv9WFcM/sJJ62Sz8fqgBL5mept36tkgyDU=; b=eiwLwe3SWgm+NVXAEA4u2f6uDR H4fwATCbtNCT75J5oAqVZlNWnNDu5PzsbE0EwFPFVoZwB2IoMKKrb154NzgSOtx0efX2cR06dNs9q UfsX1I3MMJHA7NScQvs5fwYQ5; 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 1qxF7c-0042zY-25 for gdb-patches@sourceware.org; Sun, 29 Oct 2023 17:23:08 -0600 From: Tom Tromey Date: Sun, 29 Oct 2023 17:23:41 -0600 Subject: [PATCH 20/30] Use read_var_value overload in return_command MIME-Version: 1.0 Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-20-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: 1qxF7c-0042zY-25 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: 21 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPGp+7Rrbkk8IDK4N8rdjfU9rnwUs6qHxC0gzKJNvckBChI5Ods3PAxuy00HIsLb5YN96XHdlnUK3Rx801mjjj4zDu23krSP1Bm3VFH9xlIPzhQJTTNx yU0AsnRI4e7yN0lLASEiU7yYcV4mmiV+NDSvmajfDAulVxtU1UmoUi6xhA3k7+0GrXjRHJq89HQt/Ngggv/5Wr0CyYohgfnM1fc= X-Spam-Status: No, score=-3024.5 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 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 52448ff98a5..0fba09a044c 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2699,7 +2699,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) @@ -2740,7 +2741,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)