From patchwork Fri Feb 10 21:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64713 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 AE3B5383FBAD for ; Fri, 10 Feb 2023 21:56:01 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id CFC4E3846414 for ; Fri, 10 Feb 2023 21:52:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CFC4E3846414 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 4603810047E0C for ; Fri, 10 Feb 2023 21:52:36 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QbJspX8DVNX2aQbJspI2cE; Fri, 10 Feb 2023 21:52:36 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63e6bca4 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=7d_E57ReAAAA:8 a=RL-fo4EtTtgTAjgKU3cA:9 a=QEXdDO2ut3YA:10:nop_charset_2 a=jhqOcbufqs7Y1TYCrUUU:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=lRI3Rwj2UzFwnYJqtDdUIWh1k6hBddV1wpuQH49YIUA=; b=lblkB+qY9QHugPW896sBJly8Oa VMoGqDDgByhTNJCb+38UGssY1h8d7Vd8KIrJy8GEc2YmOJnQqhgwdM1bxIiOmPUWYIatyxsb3njyo fvSmw1zSeivlsym/hDm2yMRHc; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:57244 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pQbJs-000WcR-2j; Fri, 10 Feb 2023 14:52:36 -0700 From: Tom Tromey Date: Fri, 10 Feb 2023 14:52:46 -0700 Subject: [PATCH v2 28/48] Turn allocate_value_contents into a method MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v2-28-b0b27fd97177@tromey.com> References: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> To: gdb-patches@sourceware.org Cc: Simon Marchi X-Mailer: b4 0.12.0 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: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pQbJs-000WcR-2j X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:57244 X-Source-Auth: tom+tromey.com X-Email-Count: 73 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.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 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.29 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 Sender: "Gdb-patches" This turns the static function allocate_value_contents into a private method on value. Approved-By: Simon Marchi --- gdb/value.c | 21 ++++++++++----------- gdb/value.h | 6 ++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 99ea97d3b35..fcc5481c20a 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -821,16 +821,15 @@ check_type_length_before_alloc (const struct type *type) } } -/* Allocate the contents of VAL if it has not been allocated yet. */ +/* See value.h. */ -static void -allocate_value_contents (struct value *val) +void +value::allocate_contents () { - if (!val->m_contents) + if (!m_contents) { - check_type_length_before_alloc (val->m_enclosing_type); - val->m_contents.reset - ((gdb_byte *) xzalloc (val->m_enclosing_type->length ())); + check_type_length_before_alloc (m_enclosing_type); + m_contents.reset ((gdb_byte *) xzalloc (m_enclosing_type->length ())); } } @@ -839,7 +838,7 @@ value::allocate (struct type *type) { struct value *val = value::allocate_lazy (type); - allocate_value_contents (val); + val->allocate_contents (); val->m_lazy = 0; return val; } @@ -895,7 +894,7 @@ value::contents_raw () { int unit_size = gdbarch_addressable_memory_unit_size (arch ()); - allocate_value_contents (this); + this->allocate_contents (); ULONGEST length = type ()->length (); return gdb::make_array_view @@ -905,7 +904,7 @@ value::contents_raw () gdb::array_view value::contents_all_raw () { - allocate_value_contents (this); + this->allocate_contents (); ULONGEST length = enclosing_type ()->length (); return gdb::make_array_view (m_contents.get (), length); @@ -3784,7 +3783,7 @@ void value::fetch_lazy () { gdb_assert (lazy ()); - allocate_value_contents (this); + this->allocate_contents (); /* A value is either lazy, or fully fetched. The availability/validity is only established as we try to fetch a value. */ diff --git a/gdb/value.h b/gdb/value.h index d16b2d0d864..46d3a49c669 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -559,6 +559,12 @@ struct value treated pretty much the same, except not-saved registers have a different string representation and related error strings. */ std::vector m_optimized_out; + +private: + + /* Allocate the contents of this value if it has not been allocated + yet. */ + void allocate_contents (); }; /* Returns value_type or value_enclosing_type depending on