diff options
| author | Tom Tromey <tom@tromey.com> | 2021-03-08 07:27:57 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2021-03-08 07:28:29 -0700 |
| commit | e447908052f54164eec481d15a5274ddf385569d (patch) | |
| tree | 869b45f3dba350e9a6097bac187c6ae9a77c46dc /gdb | |
| parent | 95d49dfbba00253382d0f7ad0ea2052b2b7bc445 (diff) | |
Introduce class adl_func_operation
This adds class adl_func_operation, which implements
argument-dependent lookup function calls.
Other function calls will be handled in a different way. However,
because ADL calls were created in a single spot in the C++ parser, and
because they had different semantics from the other cases, it was
convenient to treat them specially.
gdb/ChangeLog
2021-03-08 Tom Tromey <tom@tromey.com>
* expop.h (class adl_func_operation): New.
* eval.c (adl_func_operation::evaluate): New method.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/eval.c | 23 | ||||
| -rw-r--r-- | gdb/expop.h | 19 |
3 files changed, 47 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1969ec5700..627969aea6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-03-08 Tom Tromey <tom@tromey.com> + * expop.h (class adl_func_operation): New. + * eval.c (adl_func_operation::evaluate): New method. + +2021-03-08 Tom Tromey <tom@tromey.com> + * ada-lang.c (ada_unop_in_range): No longer static. * ada-exp.h (class ada_unop_range_operation): New. diff --git a/gdb/eval.c b/gdb/eval.c index 44384130f6..972e63035b 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2549,6 +2549,29 @@ logical_or_operation::evaluate (struct type *expect_type, } } +value * +adl_func_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + std::vector<operation_up> &arg_ops = std::get<2> (m_storage); + std::vector<value *> args (arg_ops.size ()); + for (int i = 0; i < arg_ops.size (); ++i) + args[i] = arg_ops[i]->evaluate_with_coercion (exp, noside); + + struct symbol *symp; + find_overload_match (args, std::get<0> (m_storage).c_str (), + NON_METHOD, + nullptr, nullptr, + nullptr, &symp, nullptr, 0, noside); + if (SYMBOL_TYPE (symp)->code () == TYPE_CODE_ERROR) + error_unknown_type (symp->print_name ()); + value *callee = evaluate_var_value (noside, std::get<1> (m_storage), symp); + return evaluate_subexp_do_call (exp, noside, callee, args, + nullptr, expect_type); + +} + } struct value * diff --git a/gdb/expop.h b/gdb/expop.h index 7850c457ad..0785df939e 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -2030,6 +2030,25 @@ protected: override; }; +/* This class implements ADL (aka Koenig) function calls for C++. It + holds the name of the function to call, the block in which the + lookup should be done, and a vector of arguments. */ +class adl_func_operation + : public tuple_holding_operation<std::string, const block *, + std::vector<operation_up>> +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return OP_ADL_FUNC; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ |