diff options
| author | Pedro Alves <palves@redhat.com> | 2018-11-21 11:55:12 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2018-11-21 12:06:20 +0000 |
| commit | 6b1747cd135ff9859fceb6043179b1ef94363996 (patch) | |
| tree | 9dd00eb42169b61747d43efeec410c66ba7070e3 /gdb/extension.c | |
| parent | e71585ffe2e1394858f0fcf809e86f1b324fe4e6 (diff) | |
| download | gdb-6b1747cd135ff9859fceb6043179b1ef94363996.zip gdb-6b1747cd135ff9859fceb6043179b1ef94363996.tar.gz gdb-6b1747cd135ff9859fceb6043179b1ef94363996.tar.bz2 | |
invoke_xmethod & array_view
This replaces more pointer+length with gdb::array_view. This time,
around invoke_xmethod, and then propagating the fallout around, which
inevitably leaks to the overload resolution code.
There are several places in the code that want to grab a slice of an
array, by advancing the array pointer, and decreasing the length
pointer. This patch introduces a pair of new
gdb::array_view::slice(...) methods to make that convenient and clear.
Unit test included.
gdb/ChangeLog:
2018-11-21 Pedro Alves <palves@redhat.com>
* common/array-view.h (array_view::splice(size_type, size_t)): New.
(array_view::splice(size_type)): New.
* eval.c (eval_call, evaluate_funcall): Adjust to use array_view.
* extension.c (xmethod_worker::get_arg_types): Adjust to return an
std::vector.
(xmethod_worker::get_result_type): Adjust to use gdb::array_view.
* extension.h: Include "common/array-view.h".
(xmethod_worker::invoke): Adjust to use gdb::array_view.
(xmethod_worker::get_arg_types): Adjust to return an std::vector.
(xmethod_worker::get_result_type): Adjust to use gdb::array_view.
(xmethod_worker::do_get_arg_types): Adjust to use std::vector.
(xmethod_worker::do_get_result_type): Adjust to use
gdb::array_view.
* gdbtypes.c (rank_function): Adjust to use gdb::array_view.
* gdbtypes.h: Include "common/array-view.h".
(rank_function): Adjust to use gdb::array_view.
* python/py-xmethods.c (python_xmethod_worker::invoke)
(python_xmethod_worker::do_get_arg_types)
(python_xmethod_worker::do_get_result_type)
(python_xmethod_worker::invoke): Adjust to new interfaces.
* valarith.c (value_user_defined_cpp_op, value_user_defined_op)
(value_x_binop, value_x_unop): Adjust to use gdb::array_view.
* valops.c (find_overload_match, find_oload_champ_namespace)
(find_oload_champ_namespace_loop, find_oload_champ): Adjust to use
gdb:array_view and the new xmethod_worker interfaces.
* value.c (result_type_of_xmethod, call_xmethod): Adjust to use
gdb::array_view.
* value.h (find_overload_match, result_type_of_xmethod)
(call_xmethod): Adjust to use gdb::array_view.
* unittests/array-view-selftests.c: Add slicing tests.
Diffstat (limited to 'gdb/extension.c')
| -rw-r--r-- | gdb/extension.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/extension.c b/gdb/extension.c index e5c0146..31d19b5 100644 --- a/gdb/extension.c +++ b/gdb/extension.c @@ -870,12 +870,12 @@ get_matching_xmethod_workers (struct type *type, const char *method_name, /* See extension.h. */ -type ** -xmethod_worker::get_arg_types (int *nargs) +std::vector<type *> +xmethod_worker::get_arg_types () { - type **type_array = NULL; + std::vector<type *> type_array; - ext_lang_rc rc = do_get_arg_types (nargs, &type_array); + ext_lang_rc rc = do_get_arg_types (&type_array); if (rc == EXT_LANG_RC_ERROR) error (_("Error while looking for arg types of a xmethod worker " "defined in %s."), m_extlang->capitalized_name); @@ -886,11 +886,11 @@ xmethod_worker::get_arg_types (int *nargs) /* See extension.h. */ struct type * -xmethod_worker::get_result_type (value *object, value **args, int nargs) +xmethod_worker::get_result_type (value *object, gdb::array_view<value *> args) { type *result_type; - ext_lang_rc rc = do_get_result_type (object, args, nargs, &result_type); + ext_lang_rc rc = do_get_result_type (object, args, &result_type); if (rc == EXT_LANG_RC_ERROR) { error (_("Error while fetching result type of an xmethod worker " |