diff mbox series

[v2,39/48] Change some code to use value methods

Message ID	20230209-submit-value-fixups-2023-v2-39-b0b27fd97177@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DDAF2385840C From: Tom Tromey <tom@tromey.com> Date: Fri, 10 Feb 2023 14:52:57 -0700 Subject: [PATCH v2 39/48] Change some code to use value methods MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230209-submit-value-fixups-2023-v2-39-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

  A few functions in value.c were accessing the internal fields of
struct value.  However, in these cases it seemed simpler to change
them to use the public API rather than convert them to be methods.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
 gdb/value.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff mbox series

Patch

diff --git a/gdb/value.c b/gdb/value.c
index 0d340897f10..b36c77694f6 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -819,7 +819,7 @@  value::allocate (struct type *type)
   struct value *val = value::allocate_lazy (type);
 
   val->allocate_contents ();
-  val->m_lazy = 0;
+  val->set_lazy (0);
   return val;
 }
 
@@ -1930,7 +1930,7 @@  value_of_internalvar (struct gdbarch *gdbarch, struct internalvar *var)
      want.  */
 
   if (var->kind != INTERNALVAR_MAKE_VALUE
-      && val->m_lval != lval_computed)
+      && val->lval () != lval_computed)
     {
       VALUE_LVAL (val) = lval_internalvar;
       VALUE_INTERNALVAR (val) = var;
@@ -2742,15 +2742,15 @@  value_primitive_field (struct value *arg1, LONGEST offset,
       LONGEST container_bitsize = type->length () * 8;
 
       v = value::allocate_lazy (type);
-      v->m_bitsize = TYPE_FIELD_BITSIZE (arg_type, fieldno);
-      if ((bitpos % container_bitsize) + v->m_bitsize <= container_bitsize
+      v->set_bitsize (TYPE_FIELD_BITSIZE (arg_type, fieldno));
+      if ((bitpos % container_bitsize) + v->bitsize () <= container_bitsize
 	  && type->length () <= (int) sizeof (LONGEST))
-	v->m_bitpos = bitpos % container_bitsize;
+	v->set_bitpos (bitpos % container_bitsize);
       else
-	v->m_bitpos = bitpos % 8;
-      v->m_offset = (arg1->embedded_offset ()
-		   + offset
-		   + (bitpos - v->m_bitpos) / 8);
+	v->set_bitpos (bitpos % 8);
+      v->set_offset ((arg1->embedded_offset ()
+		      + offset
+		      + (bitpos - v->bitpos ()) / 8));
       v->set_parent (arg1);
       if (!arg1->lazy ())
 	v->fetch_lazy ();
@@ -2786,9 +2786,9 @@  value_primitive_field (struct value *arg1, LONGEST offset,
 	  value_contents_copy_raw (v, 0, arg1, 0,
 				   arg1->enclosing_type ()->length ());
 	}
-      v->m_type = type;
-      v->m_offset = arg1->offset ();
-      v->m_embedded_offset = offset + arg1->embedded_offset () + boffset;
+      v->deprecated_set_type (type);
+      v->set_offset (arg1->offset ());
+      v->set_embedded_offset (offset + arg1->embedded_offset () + boffset);
     }
   else if (NULL != TYPE_DATA_LOCATION (type))
     {
@@ -2820,8 +2820,8 @@  value_primitive_field (struct value *arg1, LONGEST offset,
 				   arg1, arg1->embedded_offset () + offset,
 				   type_length_units (type));
 	}
-      v->m_offset = (arg1->offset () + offset
-		     + arg1->embedded_offset ());
+      v->set_offset ((arg1->offset () + offset
+		      + arg1->embedded_offset ()));
     }
   v->set_component_location (arg1);
   return v;
@@ -3420,7 +3420,7 @@  value_from_component (struct value *whole, struct type *type, LONGEST offset)
 			   whole, whole->embedded_offset () + offset,
 			   type_length_units (type));
     }
-  v->m_offset = whole->offset () + offset + whole->embedded_offset ();
+  v->set_offset (whole->offset () + offset + whole->embedded_offset ());
   v->set_component_location (whole);
 
   return v;