MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement Rust funcall operation

Browse Source 
This adds the special code needed to handle the Rust function call
operation.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* rust-lang.c (rust_structop::evaluate_funcall): New method.
	* rust-exp.h (class rust_structop) <evaluate_funcall>: Declare
	method.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent a00b7254fb
commit 638fd74a61
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_structop::evaluate_funcall): New method.
* rust-exp.h (class rust_structop) <evaluate_funcall>: Declare
method.
2021-03-08 Tom Tromey <tom@tromey.com>
* expression.h (class operation) <evaluate_funcall>: New methods.

5
gdb/rust-exp.h
View File

@ -203,6 +203,11 @@ public:
std::get<1> (m_storage).c_str ());
}
value *evaluate_funcall (struct type *expect_type,
struct expression *exp,
enum noside noside,
const std::vector<operation_up> &args) override;
enum exp_opcode opcode () const override
{ return STRUCTOP_STRUCT; }
};

50
gdb/rust-lang.c
View File

@ -1756,6 +1756,56 @@ rust_aggregate_operation::evaluate (struct type *expect_type,
return result;
}
value *
rust_structop::evaluate_funcall (struct type *expect_type,
struct expression *exp,
enum noside noside,
const std::vector<operation_up> &ops)
{
std::vector<struct value *> args (ops.size () + 1);
/* Evaluate the argument to STRUCTOP_STRUCT, then find its
type in order to look up the method. */
args[0] = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
/* We don't yet implement real Deref semantics. */
while (value_type (args[0])->code () == TYPE_CODE_PTR)
args[0] = value_ind (args[0]);
struct type *type = value_type (args[0]);
if ((type->code () != TYPE_CODE_STRUCT
&& type->code () != TYPE_CODE_UNION
&& type->code () != TYPE_CODE_ENUM)
|| rust_tuple_type_p (type))
error (_("Method calls only supported on struct or enum types"));
if (type->name () == NULL)
error (_("Method call on nameless type"));
std::string name = (std::string (type->name ()) + "::"
+ std::get<1> (m_storage));
const struct block *block = get_selected_block (0);
struct block_symbol sym = lookup_symbol (name.c_str (), block,
VAR_DOMAIN, NULL);
if (sym.symbol == NULL)
error (_("Could not find function named '%s'"), name.c_str ());
struct type *fn_type = SYMBOL_TYPE (sym.symbol);
if (fn_type->num_fields () == 0)
error (_("Function '%s' takes no arguments"), name.c_str ());
if (fn_type->field (0).type ()->code () == TYPE_CODE_PTR)
args[0] = value_addr (args[0]);
value *function = address_of_variable (sym.symbol, block);
for (int i = 0; i < ops.size (); ++i)
args[i + 1] = ops[i]->evaluate (nullptr, exp, noside);
if (noside == EVAL_AVOID_SIDE_EFFECTS)
return value_zero (TYPE_TARGET_TYPE (fn_type), not_lval);
return call_function_by_hand (function, NULL, args);
}
}
/* operator_length implementation for Rust. */