From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 40/48] Turn some xmethod functions into methods
Date: Fri, 10 Feb 2023 14:52:58 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v2-40-b0b27fd97177@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com>
This turns value_from_xmethod, result_type_of_xmethod, and
call_xmethod to be methods of value. value_from_xmethod is a static
"constructor" now.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/eval.c | 4 ++--
gdb/valarith.c | 8 ++++----
gdb/valops.c | 2 +-
gdb/value.c | 22 +++++++++++-----------
gdb/value.h | 22 +++++++++++-----------
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/gdb/eval.c b/gdb/eval.c
index 808cc916bb4..b263dc998d6 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -640,7 +640,7 @@ evaluate_subexp_do_call (expression *exp, enum noside noside,
}
else if (ftype->code () == TYPE_CODE_XMETHOD)
{
- type *return_type = result_type_of_xmethod (callee, argvec);
+ type *return_type = callee->result_type_of_xmethod (argvec);
if (return_type == NULL)
error (_("Xmethod is missing return type."));
@@ -678,7 +678,7 @@ evaluate_subexp_do_call (expression *exp, enum noside noside,
return call_internal_function (exp->gdbarch, exp->language_defn,
callee, argvec.size (), argvec.data ());
case TYPE_CODE_XMETHOD:
- return call_xmethod (callee, argvec);
+ return callee->call_xmethod (argvec);
default:
return call_function_by_hand (callee, default_return_type, argvec);
}
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 328781ba784..117662fda95 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -513,13 +513,13 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
struct type *return_type
- = result_type_of_xmethod (argvec[0], argvec.slice (1));
+ = argvec[0]->result_type_of_xmethod (argvec.slice (1));
if (return_type == NULL)
error (_("Xmethod is missing return type."));
return value::zero (return_type, VALUE_LVAL (arg1));
}
- return call_xmethod (argvec[0], argvec.slice (1));
+ return argvec[0]->call_xmethod (argvec.slice (1));
}
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
@@ -626,13 +626,13 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
struct type *return_type
- = result_type_of_xmethod (argvec[0], argvec[1]);
+ = argvec[0]->result_type_of_xmethod (argvec[1]);
if (return_type == NULL)
error (_("Xmethod is missing return type."));
return value::zero (return_type, VALUE_LVAL (arg1));
}
- return call_xmethod (argvec[0], argvec[1]);
+ return argvec[0]->call_xmethod (argvec[1]);
}
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
diff --git a/gdb/valops.c b/gdb/valops.c
index 137134abe6c..89bd5c95a2c 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3028,7 +3028,7 @@ find_overload_match (gdb::array_view<value *> args,
method_oload_champ, basetype, boffset);
}
else
- *valp = value_from_xmethod
+ *valp = value::from_xmethod
(std::move (xmethods[ext_method_oload_champ]));
}
else
diff --git a/gdb/value.c b/gdb/value.c
index b36c77694f6..cccb02411c6 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2355,7 +2355,7 @@ show_convenience (const char *ignore, int from_tty)
/* See value.h. */
struct value *
-value_from_xmethod (xmethod_worker_up &&worker)
+value::from_xmethod (xmethod_worker_up &&worker)
{
struct value *v;
@@ -2367,26 +2367,26 @@ value_from_xmethod (xmethod_worker_up &&worker)
return v;
}
-/* Return the type of the result of TYPE_CODE_XMETHOD value METHOD. */
+/* See value.h. */
struct type *
-result_type_of_xmethod (struct value *method, gdb::array_view<value *> argv)
+value::result_type_of_xmethod (gdb::array_view<value *> argv)
{
- gdb_assert (method->type ()->code () == TYPE_CODE_XMETHOD
- && method->m_lval == lval_xcallable && !argv.empty ());
+ gdb_assert (type ()->code () == TYPE_CODE_XMETHOD
+ && m_lval == lval_xcallable && !argv.empty ());
- return method->m_location.xm_worker->get_result_type (argv[0], argv.slice (1));
+ return m_location.xm_worker->get_result_type (argv[0], argv.slice (1));
}
-/* Call the xmethod corresponding to the TYPE_CODE_XMETHOD value METHOD. */
+/* See value.h. */
struct value *
-call_xmethod (struct value *method, gdb::array_view<value *> argv)
+value::call_xmethod (gdb::array_view<value *> argv)
{
- gdb_assert (method->type ()->code () == TYPE_CODE_XMETHOD
- && method->m_lval == lval_xcallable && !argv.empty ());
+ gdb_assert (type ()->code () == TYPE_CODE_XMETHOD
+ && m_lval == lval_xcallable && !argv.empty ());
- return method->m_location.xm_worker->invoke (argv[0], argv.slice (1));
+ return m_location.xm_worker->invoke (argv[0], argv.slice (1));
}
\f
/* Extract a value as a C number (either long or double).
diff --git a/gdb/value.h b/gdb/value.h
index 8f4636ed6b4..573b5e14319 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -542,6 +542,17 @@ struct value
WHOLE --- regardless of what kind of lvalue WHOLE is. */
void set_component_location (const struct value *whole);
+ /* Build a value wrapping and representing WORKER. The value takes
+ ownership of the xmethod_worker object. */
+ static struct value *from_xmethod (xmethod_worker_up &&worker);
+
+ /* Return the type of the result of TYPE_CODE_XMETHOD value METHOD. */
+ struct type *result_type_of_xmethod (gdb::array_view<value *> argv);
+
+ /* Call the xmethod corresponding to the TYPE_CODE_XMETHOD value
+ METHOD. */
+ struct value *call_xmethod (gdb::array_view<value *> argv);
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -1478,17 +1489,6 @@ struct value *call_internal_function (struct gdbarch *gdbarch,
const char *value_internal_function_name (struct value *);
-/* Build a value wrapping and representing WORKER. The value takes ownership
- of the xmethod_worker object. */
-
-extern struct value *value_from_xmethod (xmethod_worker_up &&worker);
-
-extern struct type *result_type_of_xmethod (struct value *method,
- gdb::array_view<value *> argv);
-
-extern struct value *call_xmethod (struct value *method,
- gdb::array_view<value *> argv);
-
/* Destroy the values currently allocated. This is called when GDB is
exiting (e.g., on quit_force). */
extern void finalize_values ();
--
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 ` Tom Tromey [this message]
2023-02-10 21:52 ` [PATCH v2 41/48] Turn preserve_one_value into method Tom Tromey
2023-02-10 21:53 ` [PATCH v2 42/48] Turn various value copying-related functions into methods 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-40-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).