diff mbox series

[28/47] Turn allocate_value_contents into a method

Message ID	20230209-submit-value-fixups-2023-v1-28-55dc2794dbb9@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55D6C385B51F From: Tom Tromey <tom@tromey.com> 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 Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Use methods for struct value \| [00/47] Use methods for struct value [01/47] Rename all fields of struct value [02/47] Move ~value body out-of-line [03/47] Move struct value to value.h [04/47] Turn value_type into method [05/47] Turn deprecated_set_value_type into a method [06/47] Turn value_arch into method [07/47] Turn value_bitsize into method [08/47] Turn value_bitpos into method [09/47] Turn value_parent into method [10/47] Turn value_offset into method [11/47] Turn deprecated_value_modifiable into method [12/47] Turn value_enclosing_type into method [13/47] Turn some value offset functions into method [14/47] Turn value_lazy and set_value_lazy functions into methods [15/47] Turn value_stack and set_value_stack functions into methods [16/47] Turn value_computed_closure and value_computed_funcs functions into methods [17/47] Convert value_lval_const and deprecated_lval_hack to methods [18/47] Turn value_initialized and set_value_initialized functions into methods [19/47] Turn value_address and set_value_address functions into methods [20/47] Turn more deprecated_* functions into methods [21/47] Turn allocate_value_lazy into a static "constructor" [22/47] Turn allocate_value into a static "constructor" [23/47] Turn allocate_computed_value into static "constructor" [24/47] Turn allocate_optimized_out_value into static "constructor" [25/47] Turn value_zero into static "constructor" [26/47] Turn some value_contents functions into methods [27/47] Turn value_fetch_lazy into a method [28/47] Turn allocate_value_contents into a method [29/47] Turn value_contents_eq into a method [30/47] Turn value_bits_synthetic_pointer into a method [31/47] Move value_ref_policy methods out-of-line [32/47] Turn value_incref and value_decref into methods [33/47] Turn remaining value_contents functions into methods [34/47] Fully qualify calls to copy in value.c [35/47] Turn value_copy into a method [36/47] Turn many optimized-out value functions into methods [37/47] Turn value_non_lval and value_force_lval into methods [38/47] Turn set_value_component_location into method [39/47] Change some code to use value methods [40/47] Turn some xmethod functions into methods [41/47] Turn preserve_one_value into method [42/47] Turn various value copying-related functions into methods [43/47] Add value::set_modifiable [44/47] Make struct value data members private [45/47] Make ~value private [46/47] Introduce set_lval method on value [47/47] Remove deprecated_lval_hack

Commit Message

Tom Tromey Feb. 9, 2023, 9:38 p.m. UTC

  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 mbox series

Patch

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<gdb_byte>
 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<range> 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