diff mbox series

[v2,28/48] Turn allocate_value_contents into a method

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

Commit Message

Tom Tromey Feb. 10, 2023, 9:52 p.m. UTC

  This turns the static function allocate_value_contents into a private
method on value.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
 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 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<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);
@@ -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<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