diff mbox series

[v2,15/48] Turn value_stack and set_value_stack functions into methods

Message ID 20230209-submit-value-fixups-2023-v2-15-b0b27fd97177@tromey.com
State New
Headers
Series Use methods for struct value |

Commit Message

Tom Tromey Feb. 10, 2023, 9:52 p.m. UTC 
  This changes the value_stack and set_value_stack functions to be
methods of value.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
 gdb/dwarf2/expr.c  |  2 +-
 gdb/frame-unwind.c |  2 +-
 gdb/valops.c       |  2 +-
 gdb/value.c        | 14 +-------------
 gdb/value.h        |  9 ++++++---
 5 files changed, 10 insertions(+), 19 deletions(-)
diff mbox series

Patch

diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index 0274372a0c4..292ac8bb559 100644
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -1005,7 +1005,7 @@  dwarf_expr_context::fetch_result (struct type *type, struct type *subobj_type,
 	    retval = value_at_lazy (subobj_type,
 				    address + subobj_offset);
 	    if (in_stack_memory)
-	      set_value_stack (retval, 1);
+	      retval->set_stack (1);
 	  }
 	  break;
 
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 76601faa479..d3baedb8a6f 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -289,7 +289,7 @@  frame_unwind_got_memory (frame_info_ptr frame, int regnum, CORE_ADDR addr)
   struct gdbarch *gdbarch = frame_unwind_arch (frame);
   struct value *v = value_at_lazy (register_type (gdbarch, regnum), addr);
 
-  set_value_stack (v, 1);
+  v->set_stack (1);
   return v;
 }
 
diff --git a/gdb/valops.c b/gdb/valops.c
index 1823b0bc1d6..7e3fca30af2 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1376,7 +1376,7 @@  value_repeat (struct value *arg1, int count)
   VALUE_LVAL (val) = lval_memory;
   set_value_address (val, value_address (arg1));
 
-  read_value_memory (val, 0, value_stack (val), value_address (val),
+  read_value_memory (val, 0, val->stack (), value_address (val),
 		     value_contents_all_raw (val).data (),
 		     type_length_units (val->enclosing_type ()));
 
diff --git a/gdb/value.c b/gdb/value.c
index 646d24ebf26..217d2780e37 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1161,18 +1161,6 @@  value_contents_copy (struct value *dst, LONGEST dst_offset,
   value_contents_copy_raw (dst, dst_offset, src, src_offset, length);
 }
 
-int
-value_stack (const struct value *value)
-{
-  return value->m_stack;
-}
-
-void
-set_value_stack (struct value *value, int val)
-{
-  value->m_stack = val;
-}
-
 gdb::array_view<const gdb_byte>
 value_contents (struct value *value)
 {
@@ -3708,7 +3696,7 @@  value_fetch_lazy_memory (struct value *val)
   struct type *type = check_typedef (val->enclosing_type ());
 
   if (type->length ())
-      read_value_memory (val, 0, value_stack (val),
+    read_value_memory (val, 0, val->stack (),
 			 addr, value_contents_all_raw (val).data (),
 			 type_length_units (type));
 }
diff --git a/gdb/value.h b/gdb/value.h
index 8e0432bd50d..532fa859097 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -294,6 +294,12 @@  struct value
 
   void set_enclosing_type (struct type *new_type);
 
+  int stack () const
+  { return m_stack; }
+
+  void set_stack (int val)
+  { m_stack = val; }
+
 
   /* Type of value; either not an lval, or one of the various
      different possible kinds of lval.  */
@@ -556,9 +562,6 @@  extern const struct lval_funcs *value_computed_funcs (const struct value *);
 
 extern void *value_computed_closure (const struct value *value);
 
-extern int value_stack (const struct value *);
-extern void set_value_stack (struct value *value, int val);
-
 /* Throw an error complaining that the value has been optimized
    out.  */