From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 41/48] Turn preserve_one_value into method
Date: Fri, 10 Feb 2023 14:52:59 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v2-41-b0b27fd97177@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com>
This changes preserve_one_value to be a method of value. Much of this
patch was written by script.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/guile/scm-value.c | 2 +-
gdb/python/py-value.c | 2 +-
gdb/value.c | 21 ++++++++-------------
gdb/value.h | 6 ++++--
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 3e18bd1fdc3..a0b7e6661b5 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -91,7 +91,7 @@ gdbscm_preserve_values (const struct extension_language_defn *extlang,
value_smob *iter;
for (iter = values_in_scheme; iter; iter = iter->next)
- preserve_one_value (iter->value, objfile, copied_types);
+ iter->value->preserve (objfile, copied_types);
}
/* Helper to add a value_smob to the global list. */
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 6c33e3529c8..658a9a3f18c 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -228,7 +228,7 @@ gdbpy_preserve_values (const struct extension_language_defn *extlang,
value_object *iter;
for (iter = values_in_python; iter; iter = iter->next)
- preserve_one_value (iter->value, objfile, copied_types);
+ iter->value->preserve (objfile, copied_types);
}
/* Given a value of a pointer type, apply the C unary * operator to it. */
diff --git a/gdb/value.c b/gdb/value.c
index cccb02411c6..c440b9b0375 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2218,19 +2218,14 @@ add_internal_function (gdb::unique_xmalloc_ptr<char> &&name,
cmd->name_allocated = 1;
}
-/* Update VALUE before discarding OBJFILE. COPIED_TYPES is used to
- prevent cycles / duplicates. */
-
void
-preserve_one_value (struct value *value, struct objfile *objfile,
- htab_t copied_types)
+value::preserve (struct objfile *objfile, htab_t copied_types)
{
- if (value->m_type->objfile_owner () == objfile)
- value->m_type = copy_type_recursive (value->m_type, copied_types);
+ if (m_type->objfile_owner () == objfile)
+ m_type = copy_type_recursive (m_type, copied_types);
- if (value->m_enclosing_type->objfile_owner () == objfile)
- value->m_enclosing_type = copy_type_recursive (value->m_enclosing_type,
- copied_types);
+ if (m_enclosing_type->objfile_owner () == objfile)
+ m_enclosing_type = copy_type_recursive (m_enclosing_type, copied_types);
}
/* Likewise for internal variable VAR. */
@@ -2249,7 +2244,7 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
break;
case INTERNALVAR_VALUE:
- preserve_one_value (var->u.value, objfile, copied_types);
+ var->u.value->preserve (objfile, copied_types);
break;
}
}
@@ -2270,7 +2265,7 @@ preserve_one_varobj (struct varobj *varobj, struct objfile *objfile,
}
if (varobj->value != nullptr)
- preserve_one_value (varobj->value.get (), objfile, copied_types);
+ varobj->value.get ()->preserve (objfile, copied_types);
}
/* Update the internal variables and value history when OBJFILE is
@@ -2289,7 +2284,7 @@ preserve_values (struct objfile *objfile)
htab_up copied_types = create_copied_types_hash ();
for (const value_ref_ptr &item : value_history)
- preserve_one_value (item.get (), objfile, copied_types.get ());
+ item.get ()->preserve (objfile, copied_types.get ());
for (var = internalvars; var; var = var->next)
preserve_one_internalvar (var, objfile, copied_types.get ());
diff --git a/gdb/value.h b/gdb/value.h
index 573b5e14319..e1cc2221dc0 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -553,6 +553,10 @@ struct value
METHOD. */
struct value *call_xmethod (gdb::array_view<value *> argv);
+ /* Update this value before discarding OBJFILE. COPIED_TYPES is
+ used to prevent cycles / duplicates. */
+ void preserve (struct objfile *objfile, htab_t copied_types);
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -1429,8 +1433,6 @@ extern void preserve_values (struct objfile *);
extern struct value *make_cv_value (int, int, struct value *);
-extern void preserve_one_value (struct value *, struct objfile *, htab_t);
-
/* From valops.c */
extern struct value *varying_to_slice (struct value *);
--
2.39.1
next prev parent reply other threads:[~2023-02-10 23:21 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 21:52 [PATCH v2 00/48] Use methods for struct value Tom Tromey
2023-02-10 21:52 ` [PATCH v2 01/48] Rename all fields of " Tom Tromey
2023-02-11 13:44 ` Simon Marchi
2023-02-13 14:15 ` Tom Tromey
2023-02-10 21:52 ` [PATCH v2 02/48] Move ~value body out-of-line Tom Tromey
2023-02-10 21:52 ` [PATCH v2 03/48] Move struct value to value.h Tom Tromey
2023-02-10 21:52 ` [PATCH v2 04/48] Turn value_type into method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 05/48] Turn deprecated_set_value_type into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 06/48] Turn value_arch into method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 07/48] Turn value_bitsize " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 08/48] Turn value_bitpos " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 09/48] Turn value_parent " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 10/48] Turn value_offset " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 11/48] Turn deprecated_value_modifiable " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 12/48] Turn value_enclosing_type " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 13/48] Turn some value offset functions " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 14/48] Turn value_lazy and set_value_lazy functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 15/48] Turn value_stack and set_value_stack " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 16/48] Turn value_computed_closure and value_computed_funcs " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 17/48] Convert value_lval_const and deprecated_lval_hack to methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 18/48] Turn value_initialized and set_value_initialized functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 19/48] Turn value_address and set_value_address " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 20/48] Turn more deprecated_* " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 21/48] Turn allocate_value_lazy into a static "constructor" Tom Tromey
2023-02-10 21:52 ` [PATCH v2 22/48] Turn allocate_value " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 23/48] Turn allocate_computed_value into " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 24/48] Turn allocate_optimized_out_value " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 25/48] Turn value_zero " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 26/48] Turn some value_contents functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 27/48] Turn value_fetch_lazy into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 28/48] Turn allocate_value_contents " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 29/48] Turn value_contents_eq " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 30/48] Turn value_bits_synthetic_pointer " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 31/48] Move value_ref_policy methods out-of-line Tom Tromey
2023-02-10 21:52 ` [PATCH v2 32/48] Turn value_incref and value_decref into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 33/48] Turn remaining value_contents functions " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 34/48] Fully qualify calls to copy in value.c Tom Tromey
2023-02-10 21:52 ` [PATCH v2 35/48] Turn value_copy into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 36/48] Turn many optimized-out value functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 37/48] Turn value_non_lval and value_force_lval " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 38/48] Turn set_value_component_location into method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 39/48] Change some code to use value methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 40/48] Turn some xmethod functions into methods Tom Tromey
2023-02-10 21:52 ` Tom Tromey [this message]
2023-02-10 21:53 ` [PATCH v2 42/48] Turn various value copying-related " Tom Tromey
2023-02-11 13:46 ` Simon Marchi
2023-02-12 15:14 ` Tom Tromey
2023-02-10 21:53 ` [PATCH v2 43/48] Add value::set_modifiable Tom Tromey
2023-02-10 21:53 ` [PATCH v2 44/48] Make struct value data members private Tom Tromey
2023-02-10 21:53 ` [PATCH v2 45/48] Make ~value private Tom Tromey
2023-02-10 21:53 ` [PATCH v2 46/48] Introduce set_lval method on value Tom Tromey
2023-02-10 21:53 ` [PATCH v2 47/48] Remove deprecated_lval_hack Tom Tromey
2023-02-10 21:53 ` [PATCH v2 48/48] Rely on value_ref_ptr::operator-> Tom Tromey
2023-02-11 13:40 ` [PATCH v2 00/48] Use methods for struct value Simon Marchi
2023-02-11 13:47 ` Simon Marchi
2023-02-12 4:11 ` 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-v2-41-b0b27fd97177@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.com \
/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).