From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 32/47] Turn value_incref and value_decref into methods
Date: Thu, 09 Feb 2023 14:38:53 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v1-32-55dc2794dbb9@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com>
This changes value_incref and value_decref to be methods of value.
Much of this patch was written by script.
---
gdb/dwarf2/expr.c | 4 ++--
gdb/dwarf2/loc.c | 6 +++---
gdb/guile/scm-value.c | 4 ++--
gdb/opencl-lang.c | 4 ++--
gdb/python/py-value.c | 4 ++--
gdb/value.c | 23 ++++++-----------------
gdb/value.h | 21 ++++++++++-----------
7 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index ef93b89aaa9..f2a1305713a 100644
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -128,7 +128,7 @@ allocate_piece_closure (dwarf2_per_cu_data *per_cu,
for (dwarf_expr_piece &piece : c->pieces)
if (piece.location == DWARF_VALUE_STACK)
- value_incref (piece.v.value);
+ piece.v.value->incref ();
return c;
}
@@ -620,7 +620,7 @@ free_pieced_value_closure (value *v)
{
for (dwarf_expr_piece &p : c->pieces)
if (p.location == DWARF_VALUE_STACK)
- value_decref (p.v.value);
+ p.v.value->decref ();
delete c;
}
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 0aa6aafe823..64a7e035b06 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -1280,7 +1280,7 @@ entry_data_value_coerce_ref (const struct value *value)
return NULL;
target_val = (struct value *) value->computed_closure ();
- value_incref (target_val);
+ target_val->incref ();
return target_val;
}
@@ -1291,7 +1291,7 @@ entry_data_value_copy_closure (const struct value *v)
{
struct value *target_val = (struct value *) v->computed_closure ();
- value_incref (target_val);
+ target_val->incref ();
return target_val;
}
@@ -1302,7 +1302,7 @@ entry_data_value_free_closure (struct value *v)
{
struct value *target_val = (struct value *) v->computed_closure ();
- value_decref (target_val);
+ target_val->decref ();
}
/* Vector for methods for an entry value reference where the referenced value
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 195fd3b8912..09b1ce30024 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -131,7 +131,7 @@ vlscm_free_value_smob (SCM self)
value_smob *v_smob = (value_smob *) SCM_SMOB_DATA (self);
vlscm_forget_value_smob (v_smob);
- value_decref (v_smob->value);
+ v_smob->value->decref ();
return 0;
}
@@ -272,7 +272,7 @@ vlscm_scm_from_value_no_release (struct value *value)
SCM v_scm = vlscm_make_value_smob ();
value_smob *v_smob = (value_smob *) SCM_SMOB_DATA (v_scm);
- value_incref (value);
+ value->incref ();
v_smob->value = value;
vlscm_remember_scheme_value (v_smob);
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index e4a88a23d49..81889b97e95 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -110,7 +110,7 @@ allocate_lval_closure (int *indices, int n, struct value *val)
c->n = n;
c->indices = XCNEWVEC (int, n);
memcpy (c->indices, indices, n * sizeof (int));
- value_incref (val); /* Increment the reference counter of the value. */
+ val->incref (); /* Increment the reference counter of the value. */
c->val = val;
return c;
@@ -242,7 +242,7 @@ lval_func_free_closure (struct value *v)
if (c->refc == 0)
{
- value_decref (c->val); /* Decrement the reference counter of the value. */
+ c->val->decref (); /* Decrement the reference counter of the value. */
xfree (c->indices);
xfree (c);
}
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 465d8d92bd2..c2db2d58b0d 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -81,7 +81,7 @@ static void
valpy_clear_value (value_object *self)
{
/* Indicate we are no longer interested in the value object. */
- value_decref (self->value);
+ self->value->decref ();
self->value = nullptr;
Py_CLEAR (self->address);
@@ -1806,7 +1806,7 @@ value_to_value_object_no_release (struct value *val)
val_obj = PyObject_New (value_object, &value_object_type);
if (val_obj != NULL)
{
- value_incref (val);
+ val->incref ();
val_obj->value = val;
val_obj->next = nullptr;
val_obj->prev = nullptr;
diff --git a/gdb/value.c b/gdb/value.c
index 1b304e07204..bd2a2b88b2b 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1319,28 +1319,17 @@ value_mark (void)
return all_values.back ().get ();
}
-/* See value.h. */
-
-void
-value_incref (struct value *val)
-{
- val->m_reference_count++;
-}
-
/* Release a reference to VAL, which was acquired with value_incref.
This function is also called to deallocate values from the value
chain. */
void
-value_decref (struct value *val)
+value::decref ()
{
- if (val != nullptr)
- {
- gdb_assert (val->m_reference_count > 0);
- val->m_reference_count--;
- if (val->m_reference_count == 0)
- delete val;
- }
+ gdb_assert (m_reference_count > 0);
+ m_reference_count--;
+ if (m_reference_count == 0)
+ delete this;
}
/* Free all values allocated since MARK was obtained by value_mark
@@ -2147,7 +2136,7 @@ clear_internalvar (struct internalvar *var)
switch (var->kind)
{
case INTERNALVAR_VALUE:
- value_decref (var->u.value);
+ var->u.value->decref ();
break;
case INTERNALVAR_STRING:
diff --git a/gdb/value.h b/gdb/value.h
index c72bee07ca6..2d1c489e245 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -111,15 +111,6 @@ struct range
}
};
-/* Increase VAL's reference count. */
-
-extern void value_incref (struct value *val);
-
-/* Decrease VAL's reference count. When the reference count drops to
- 0, VAL will be freed. */
-
-extern void value_decref (struct value *val);
-
/* A policy class to interface gdb::ref_ptr with struct value. */
struct value_ref_policy
@@ -454,6 +445,14 @@ struct value
int bits_synthetic_pointer (LONGEST offset, LONGEST length) const;
+ /* Increase this value's reference count. */
+ void incref ()
+ { ++m_reference_count; }
+
+ /* Decrease this value's reference count. When the reference count
+ drops to 0, it will be freed. */
+ void decref ();
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -639,13 +638,13 @@ struct value
inline void
value_ref_policy::incref (struct value *ptr)
{
- value_incref (ptr);
+ ptr->incref ();
}
inline void
value_ref_policy::decref (struct value *ptr)
{
- value_decref (ptr);
+ ptr->decref ();
}
/* Returns value_type or value_enclosing_type depending on
--
2.39.1
next prev parent reply other threads:[~2023-02-09 23:36 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 21:38 [PATCH 00/47] Use methods for struct value Tom Tromey
2023-02-09 21:38 ` [PATCH 01/47] Rename all fields of " Tom Tromey
2023-02-10 21:05 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 02/47] Move ~value body out-of-line Tom Tromey
2023-02-09 21:38 ` [PATCH 03/47] Move struct value to value.h Tom Tromey
2023-02-09 21:38 ` [PATCH 04/47] Turn value_type into method Tom Tromey
2023-02-09 21:38 ` [PATCH 05/47] Turn deprecated_set_value_type into a method Tom Tromey
2023-02-09 21:38 ` [PATCH 06/47] Turn value_arch into method Tom Tromey
2023-02-10 2:08 ` Simon Marchi
2023-02-10 16:36 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 07/47] Turn value_bitsize " Tom Tromey
2023-02-09 21:38 ` [PATCH 08/47] Turn value_bitpos " Tom Tromey
2023-02-09 21:38 ` [PATCH 09/47] Turn value_parent " Tom Tromey
2023-02-09 21:38 ` [PATCH 10/47] Turn value_offset " Tom Tromey
2023-02-09 21:38 ` [PATCH 11/47] Turn deprecated_value_modifiable " Tom Tromey
2023-02-09 21:38 ` [PATCH 12/47] Turn value_enclosing_type " Tom Tromey
2023-02-09 21:38 ` [PATCH 13/47] Turn some value offset functions " Tom Tromey
2023-02-09 21:38 ` [PATCH 14/47] Turn value_lazy and set_value_lazy functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 15/47] Turn value_stack and set_value_stack " Tom Tromey
2023-02-09 21:38 ` [PATCH 16/47] Turn value_computed_closure and value_computed_funcs " Tom Tromey
2023-02-09 21:38 ` [PATCH 17/47] Convert value_lval_const and deprecated_lval_hack to methods Tom Tromey
2023-02-09 21:38 ` [PATCH 18/47] Turn value_initialized and set_value_initialized functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 19/47] Turn value_address and set_value_address " Tom Tromey
2023-02-09 21:38 ` [PATCH 20/47] Turn more deprecated_* " Tom Tromey
2023-02-09 21:38 ` [PATCH 21/47] Turn allocate_value_lazy into a static "constructor" Tom Tromey
2023-02-09 21:38 ` [PATCH 22/47] Turn allocate_value " Tom Tromey
2023-02-09 21:38 ` [PATCH 23/47] Turn allocate_computed_value into " Tom Tromey
2023-02-09 21:38 ` [PATCH 24/47] Turn allocate_optimized_out_value " Tom Tromey
2023-02-09 21:38 ` [PATCH 25/47] Turn value_zero " Tom Tromey
2023-02-09 21:38 ` [PATCH 26/47] Turn some value_contents functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 27/47] Turn value_fetch_lazy into a method Tom Tromey
2023-02-09 21:38 ` [PATCH 28/47] Turn allocate_value_contents " Tom Tromey
2023-02-09 21:38 ` [PATCH 29/47] Turn value_contents_eq " Tom Tromey
2023-02-10 2:18 ` Simon Marchi
2023-02-10 17:46 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 30/47] Turn value_bits_synthetic_pointer " Tom Tromey
2023-02-09 21:38 ` [PATCH 31/47] Move value_ref_policy methods out-of-line Tom Tromey
2023-02-09 21:38 ` Tom Tromey [this message]
2023-02-09 21:38 ` [PATCH 33/47] Turn remaining value_contents functions into methods Tom Tromey
2023-02-10 2:24 ` Simon Marchi
2023-02-10 17:46 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 34/47] Fully qualify calls to copy in value.c Tom Tromey
2023-02-09 21:38 ` [PATCH 35/47] Turn value_copy into a method Tom Tromey
2023-02-10 2:42 ` Simon Marchi
2023-02-10 18:03 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 36/47] Turn many optimized-out value functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 37/47] Turn value_non_lval and value_force_lval " Tom Tromey
2023-02-09 21:38 ` [PATCH 38/47] Turn set_value_component_location into method Tom Tromey
2023-02-09 21:39 ` [PATCH 39/47] Change some code to use value methods Tom Tromey
2023-02-09 21:39 ` [PATCH 40/47] Turn some xmethod functions into methods Tom Tromey
2023-02-09 21:39 ` [PATCH 41/47] Turn preserve_one_value into method Tom Tromey
2023-02-09 21:39 ` [PATCH 42/47] Turn various value copying-related functions into methods Tom Tromey
2023-02-10 20:20 ` Tom Tromey
2023-02-09 21:39 ` [PATCH 43/47] Add value::set_modifiable Tom Tromey
2023-02-09 21:39 ` [PATCH 44/47] Make struct value data members private Tom Tromey
2023-02-09 21:39 ` [PATCH 45/47] Make ~value private Tom Tromey
2023-02-09 21:39 ` [PATCH 46/47] Introduce set_lval method on value Tom Tromey
2023-02-09 21:39 ` [PATCH 47/47] Remove deprecated_lval_hack Tom Tromey
2023-02-10 2:54 ` [PATCH 00/47] Use methods for struct value Simon Marchi
2023-02-10 18:08 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230209-submit-value-fixups-2023-v1-32-55dc2794dbb9@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).