aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2021-03-08 07:27:57 -0700
committerTom Tromey <tom@tromey.com>2021-03-08 07:28:27 -0700
commit5947d337d6061b884073a3a684aff2825c4a05f9 (patch)
tree672e421f087f5c858c7b9bfc0cabca22066f4c51 /gdb
parente4407a202d31a6873ea240b13125bf1ae8d20401 (diff)
downloadgdb-5947d337d6061b884073a3a684aff2825c4a05f9.zip
gdb-5947d337d6061b884073a3a684aff2825c4a05f9.tar.gz
gdb-5947d337d6061b884073a3a684aff2825c4a05f9.tar.bz2
Introduce rust_aggregate_operation
This adds class rust_aggregate_operation, which implements OP_AGGREGATE for Rust. gdb/ChangeLog 2021-03-08 Tom Tromey <tom@tromey.com> * rust-lang.c (rust_aggregate_operation::evaluate): New method. * rust-exp.h (class rust_aggregate_operation): New.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/rust-exp.h18
-rw-r--r--gdb/rust-lang.c58
3 files changed, 81 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 69a514c..ccd8d46 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2021-03-08 Tom Tromey <tom@tromey.com>
+ * rust-lang.c (rust_aggregate_operation::evaluate): New method.
+ * rust-exp.h (class rust_aggregate_operation): New.
+
+2021-03-08 Tom Tromey <tom@tromey.com>
+
* rust-lang.c (eval_op_rust_struct_anon, eval_op_rust_structop):
No longer static.
* rust-exp.h (class rust_struct_anon): New.
diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h
index 19e945c..6e529f8 100644
--- a/gdb/rust-exp.h
+++ b/gdb/rust-exp.h
@@ -207,6 +207,24 @@ public:
{ return STRUCTOP_STRUCT; }
};
+/* Rust aggregate initialization. */
+class rust_aggregate_operation
+ : public tuple_holding_operation<struct type *, operation_up,
+ std::vector<std::pair<std::string,
+ 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_AGGREGATE; }
+};
+
} /* namespace expr */
#endif /* RUST_EXP_H */
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index 1373de9..3604535 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -1700,6 +1700,64 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp,
return result;
}
+namespace expr
+{
+
+value *
+rust_aggregate_operation::evaluate (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside)
+{
+ struct type *type = std::get<0> (m_storage);
+ CORE_ADDR addr = 0;
+ struct value *addrval = NULL;
+ value *result;
+
+ if (noside == EVAL_NORMAL)
+ {
+ addrval = value_allocate_space_in_inferior (TYPE_LENGTH (type));
+ addr = value_as_long (addrval);
+ result = value_at_lazy (type, addr);
+ }
+
+ if (std::get<1> (m_storage) != nullptr)
+ {
+ struct value *init = std::get<1> (m_storage)->evaluate (nullptr, exp,
+ noside);
+
+ if (noside == EVAL_NORMAL)
+ {
+ /* This isn't quite right but will do for the time
+ being, seeing that we can't implement the Copy
+ trait anyway. */
+ value_assign (result, init);
+ }
+ }
+
+ for (const auto &item : std::get<2> (m_storage))
+ {
+ value *val = item.second->evaluate (nullptr, exp, noside);
+ if (noside == EVAL_NORMAL)
+ {
+ const char *fieldname = item.first.c_str ();
+ value *field = value_struct_elt (&result, nullptr, fieldname,
+ nullptr, "structure");
+ value_assign (field, val);
+ }
+ }
+
+ if (noside == EVAL_SKIP)
+ result = value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
+ else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ result = allocate_value (type);
+ else
+ result = value_at_lazy (type, addr);
+
+ return result;
+}
+
+}
+
/* operator_length implementation for Rust. */
static void