From 575cae2335c72a41aa54dd9dd8014c3a36db8093 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out eval_op_rust_struct_anon This splits STRUCTOP_ANONYMOUS into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * rust-lang.c (eval_op_rust_struct_anon): New function. (rust_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 ++ gdb/rust-lang.c | 130 ++++++++++++++++++++++++++---------------------- 2 files changed, 75 insertions(+), 60 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index afcf9a134c3..da33a9fa153 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * rust-lang.c (eval_op_rust_struct_anon): New function. + (rust_evaluate_subexp): Use it. + 2021-03-08 Tom Tromey * rust-lang.c (eval_op_rust_array): New function. diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 2653db3026b..54f0d61c7dc 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1382,6 +1382,73 @@ eval_op_rust_array (struct type *expect_type, struct expression *exp, } } +/* A helper function for STRUCTOP_ANONYMOUS. */ + +static struct value * +eval_op_rust_struct_anon (struct type *expect_type, struct expression *exp, + enum noside noside, + int field_number, struct value *lhs) +{ + struct type *type = value_type (lhs); + + if (type->code () == TYPE_CODE_STRUCT) + { + struct type *outer_type = NULL; + + if (rust_enum_p (type)) + { + gdb::array_view view (value_contents (lhs), + TYPE_LENGTH (type)); + type = resolve_dynamic_type (type, view, value_address (lhs)); + + if (rust_empty_enum_p (type)) + error (_("Cannot access field %d of empty enum %s"), + field_number, type->name ()); + + int fieldno = rust_enum_variant (type); + lhs = value_primitive_field (lhs, 0, fieldno, type); + outer_type = type; + type = value_type (lhs); + } + + /* Tuples and tuple structs */ + int nfields = type->num_fields (); + + if (field_number >= nfields || field_number < 0) + { + if (outer_type != NULL) + error(_("Cannot access field %d of variant %s::%s, " + "there are only %d fields"), + field_number, outer_type->name (), + rust_last_path_segment (type->name ()), + nfields); + else + error(_("Cannot access field %d of %s, " + "there are only %d fields"), + field_number, type->name (), nfields); + } + + /* Tuples are tuple structs too. */ + if (!rust_tuple_struct_type_p (type)) + { + if (outer_type != NULL) + error(_("Variant %s::%s is not a tuple variant"), + outer_type->name (), + rust_last_path_segment (type->name ())); + else + error(_("Attempting to access anonymous field %d " + "of %s, which is not a tuple, tuple struct, or " + "tuple-like variant"), + field_number, type->name ()); + } + + return value_primitive_field (lhs, 0, field_number, type); + } + else + error(_("Anonymous field access is only allowed on tuples, \ +tuple structs, and tuple-like enum variants")); +} + /* evaluate_exp implementation for Rust. */ static struct value * @@ -1513,72 +1580,15 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, { /* Anonymous field access, i.e. foo.1. */ struct value *lhs; - int pc, field_number, nfields; - struct type *type; + int pc, field_number; pc = (*pos)++; field_number = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 2; lhs = evaluate_subexp (nullptr, exp, pos, noside); - type = value_type (lhs); - - if (type->code () == TYPE_CODE_STRUCT) - { - struct type *outer_type = NULL; - - if (rust_enum_p (type)) - { - gdb::array_view view (value_contents (lhs), - TYPE_LENGTH (type)); - type = resolve_dynamic_type (type, view, value_address (lhs)); - - if (rust_empty_enum_p (type)) - error (_("Cannot access field %d of empty enum %s"), - field_number, type->name ()); - - int fieldno = rust_enum_variant (type); - lhs = value_primitive_field (lhs, 0, fieldno, type); - outer_type = type; - type = value_type (lhs); - } - - /* Tuples and tuple structs */ - nfields = type->num_fields (); - - if (field_number >= nfields || field_number < 0) - { - if (outer_type != NULL) - error(_("Cannot access field %d of variant %s::%s, " - "there are only %d fields"), - field_number, outer_type->name (), - rust_last_path_segment (type->name ()), - nfields); - else - error(_("Cannot access field %d of %s, " - "there are only %d fields"), - field_number, type->name (), nfields); - } - - /* Tuples are tuple structs too. */ - if (!rust_tuple_struct_type_p (type)) - { - if (outer_type != NULL) - error(_("Variant %s::%s is not a tuple variant"), - outer_type->name (), - rust_last_path_segment (type->name ())); - else - error(_("Attempting to access anonymous field %d " - "of %s, which is not a tuple, tuple struct, or " - "tuple-like variant"), - field_number, type->name ()); - } - - result = value_primitive_field (lhs, 0, field_number, type); - } - else - error(_("Anonymous field access is only allowed on tuples, \ -tuple structs, and tuple-like enum variants")); + return eval_op_rust_struct_anon (expect_type, exp, noside, + field_number, lhs); } break; -- 2.30.2