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 0934B385B528 for ; Sun, 5 Nov 2023 18:11:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0934B385B528 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 0934B385B528 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=1699207899; cv=none; b=wMaoun2Z2IL/seddFet5M7IgrnJKvdigey7zXALZs03c2wl4YnEwuqTjjJbKDFQOCBQ7Nnaac1l0aloIkfl0IUga2nxyLpTiQ8yuDJrX5T1Z5iD2IfVL8j5gS9G0Z/m872MN5bGq+d9HQ3gcHlpft81D1RYOts1KBExvs8+FeQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207899; c=relaxed/simple; bh=bEvN04T1BnuD2qIHO09bfTz7hy9P9cI1Bu9mCa+E3qc=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=qHOweeq9/Z9Hr76iIoSQvyL1ZIFKiBjNpRotVXhcVbAJxlnqIdt+K7e7fHbx/3Qafcz5/DXu7h3YXFAglOYhN1xQePBRpS629GrJ429w9CRIBADxfltChlhNcBP7xnnNiOghtwrDlf4BQyLiDD3nFWqAd1BWm0kZZBTFCKgb15s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6001a.ext.cloudfilter.net ([10.0.30.140]) by cmsmtp with ESMTPS id zVExq92ujgpyEzhaxq8IMT; Sun, 05 Nov 2023 18:11:36 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhawqJ1sHNUwRzhaxqng6v; Sun, 05 Nov 2023 18:11:35 +0000 X-Authority-Analysis: v=2.4 cv=I852+fsg c=1 sm=1 tr=0 ts=6547dad7 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=hhQC6KFsvGt_RSI_mqIA: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=WorQxGvi3Ys2FXJTWLhoE/2LXhHcLb1jTdG7xJCotbo=; b=n699oMt+lz62X3uaN/Vprlylpi 4TBGeQyzij1f+t8GfPWr7rVKyP+ohFzGBNYMIc5b+9S1yeVPIj1Wn02bnYBpDGPowD+icsK2UZ0pT 9ZBADsGPOY7gjP89k4sf7HXlw; 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 1qzhaw-003Y66-2P for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:34 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:12:05 -0700 Subject: [PATCH v2 27/31] Change find_frame_funname to return a block_symbol 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-27-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: 1qzhaw-003Y66-2P 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: 28 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDN3DFYQjt1BbWwdQZTQOlvM9WeoeSdCyFV3Boc8lcMVQzOh9uORVbIGwyJQqt3q0xLlDCY9yC6LRpj4k0alOeckK9jjBzkH25lryc7ZFvwWLe3sb4p9 jZJ5f55TnpcXrd6w5jHNbJeBJiVKaT5Pa5cGTx64peTxrYP0cIzYFxeEG9Ij4TAhj9bPp1emIlDQ5YBYK+JDLwAgdx3vlEMBP78= 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,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 the out parameter of find_frame_funname to be a block_symbol. This helps a later patch. --- gdb/python/py-frame.c | 4 +++- gdb/python/py-unwind.c | 4 +++- gdb/stack.c | 19 ++++++++++--------- gdb/stack.h | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 1a55e514e39..555354df920 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -316,6 +316,7 @@ frapy_block (PyObject *self, PyObject *args) static PyObject * frapy_function (PyObject *self, PyObject *args) { + block_symbol bsym = {}; struct symbol *sym = NULL; frame_info_ptr frame; @@ -326,7 +327,8 @@ frapy_function (PyObject *self, PyObject *args) FRAPY_REQUIRE_VALID (self, frame); gdb::unique_xmalloc_ptr funname - = find_frame_funname (frame, &funlang, &sym); + = find_frame_funname (frame, &funlang, &bsym); + sym = bsym.symbol; } catch (const gdb_exception &except) { diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index ee50c51b531..97035c5a140 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -658,6 +658,7 @@ pending_framepy_function (PyObject *self, PyObject *args) PENDING_FRAMEPY_REQUIRE_VALID (pending_frame); struct symbol *sym = nullptr; + block_symbol bsym = {}; try { @@ -665,7 +666,8 @@ pending_framepy_function (PyObject *self, PyObject *args) frame_info_ptr frame = pending_frame->frame_info; gdb::unique_xmalloc_ptr funname - = find_frame_funname (frame, &funlang, &sym); + = find_frame_funname (frame, &funlang, &bsym); + sym = bsym.symbol; } catch (const gdb_exception &except) { diff --git a/gdb/stack.c b/gdb/stack.c index 27a932cfcaa..5d7267b7b51 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1258,21 +1258,21 @@ get_last_displayed_sal () gdb::unique_xmalloc_ptr find_frame_funname (frame_info_ptr frame, enum language *funlang, - struct symbol **funcp) + block_symbol *funcp) { - struct symbol *func; + block_symbol func; gdb::unique_xmalloc_ptr funname; *funlang = language_unknown; if (funcp) - *funcp = NULL; + *funcp = {}; - func = get_frame_function (frame).symbol; - if (func) + func = get_frame_function (frame); + if (func.symbol != nullptr) { - const char *print_name = func->print_name (); + const char *print_name = func.symbol->print_name (); - *funlang = func->language (); + *funlang = func.symbol->language (); if (funcp) *funcp = func; if (*funlang == language_cplus) @@ -1319,14 +1319,15 @@ print_frame (const frame_print_options &fp_opts, struct ui_out *uiout = current_uiout; enum language funlang = language_unknown; struct value_print_options opts; - struct symbol *func; CORE_ADDR pc = 0; int pc_p; pc_p = get_frame_pc_if_available (frame, &pc); + block_symbol bfunc; gdb::unique_xmalloc_ptr funname - = find_frame_funname (frame, &funlang, &func); + = find_frame_funname (frame, &funlang, &bfunc); + struct symbol *func = bfunc.symbol; annotate_frame_begin (print_level ? frame_relative_level (frame) : 0, gdbarch, pc); diff --git a/gdb/stack.h b/gdb/stack.h index 1b0c2b342a4..616eb9a93d4 100644 --- a/gdb/stack.h +++ b/gdb/stack.h @@ -22,7 +22,7 @@ gdb::unique_xmalloc_ptr find_frame_funname (frame_info_ptr frame, enum language *funlang, - struct symbol **funcp); + block_symbol *funcp); typedef gdb::function_view iterate_over_block_arg_local_vars_cb; -- 2.41.0