[PATCH 047/203] Split out eval_op_rust_complement

Tom Tromey
2021-01-01T21:48:00Z

This splits UNOP_COMPLEMENT into a new function for future use.

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

* rust-lang.c (eval_op_rust_complement): New function.
(rust_evaluate_subexp): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/rust-lang.c | 28 ++++++++++++++++++----------
2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index 16a8bd18d23..5e293663828 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -1337,6 +1337,23 @@ eval_op_rust_ind (struct type *expect_type, struct expression *exp,
return value_ind (value);
}

+/* A helper function for UNOP_COMPLEMENT. */
+
+static struct value *
+eval_op_rust_complement (struct type *expect_type, struct expression *exp,
+ enum noside noside,
+ struct value *value)
+{
+ if (noside == EVAL_SKIP)
+ {
+ /* Preserving the type is enough. */
+ return value;
+ }
+ if (value_type (value)->code () == TYPE_CODE_BOOL)
+ return value_from_longest (value_type (value), value_logical_not (value));
+ return value_complement (value);
+}
+
/* evaluate_exp implementation for Rust. */

static struct value *
@@ -1367,16 +1384,7 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp,

++*pos;
value = evaluate_subexp (nullptr, exp, pos, noside);
- if (noside == EVAL_SKIP)
- {
- /* Preserving the type is enough. */
- return value;
- }
- if (value_type (value)->code () == TYPE_CODE_BOOL)
- result = value_from_longest (value_type (value),
- value_logical_not (value));
- else
- result = value_complement (value);
+ result = eval_op_rust_complement (expect_type, exp, noside, value);
}
break;

--
2.26.2