From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 55D6C385B51F for ; Thu, 9 Feb 2023 21:38:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55D6C385B51F 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 progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id AFC191004061E for ; Thu, 9 Feb 2023 21:38:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QEctpHudfNX2aQEctp2uD3; Thu, 09 Feb 2023 21:38:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63e567e3 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=RL-fo4EtTtgTAjgKU3cA:9 a=QEXdDO2ut3YA:10:nop_charset_2 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=2/EEukR8SpJH8I+iUGtXDxrankJj9+bT/v7OglRFs3Y=; b=be0xyUfdVbp9X439FaNwKh3+y0 2w33Hf2epl/CQQBjHBE2F2WoF6V9FyZvPuQvGPn0R+8qqvGk0m7/uIbTZ4LtT4+9CEvCAStAvkY9H T+ckisFHIdAWDdXjrBDs1JxXI; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:52822 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 1pQEct-001ZcE-IG for gdb-patches@sourceware.org; Thu, 09 Feb 2023 14:38:43 -0700 From: Tom Tromey Date: Thu, 09 Feb 2023 14:38:49 -0700 Subject: [PATCH 28/47] Turn allocate_value_contents into a method MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230209-submit-value-fixups-2023-v1-28-55dc2794dbb9@tromey.com> References: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> To: gdb-patches@sourceware.org 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: 1pQEct-001ZcE-IG 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]:52822 X-Source-Auth: tom+tromey.com X-Email-Count: 29 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.6 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 List-Id: This turns the static function allocate_value_contents into a private method on value. --- 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 57f57f38b26..77315a1a337 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; } @@ -896,7 +895,7 @@ value::contents_raw () struct gdbarch *arch = get_arch (); 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 @@ -906,7 +905,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); @@ -3785,7 +3784,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 23fffb18158..e3574b3a169 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -561,6 +561,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 -- 2.39.1