[PATCH 036/203] Split out eval_op_type

Tom Tromey
2021-01-01T21:47:57Z

This splits OP_TYPE into a new function for future use.

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

* eval.c (eval_op_type): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 21 +++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index fb9be4e6838..2907362f709 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2014,6 +2014,20 @@ eval_op_postdec (struct type *expect_type, struct expression *exp,
}
}

+/* A helper function for OP_TYPE. */
+
+static struct value *
+eval_op_type (struct type *expect_type, struct expression *exp,
+ enum noside noside, struct type *type)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ return allocate_value (type);
+ else
+ error (_("Attempt to use a type name as an expression"));
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -2969,12 +2983,7 @@ evaluate_subexp_standard (struct type *expect_type,
/* The value is not supposed to be used. This is here to make it
easier to accommodate expressions that contain types. */
(*pos) += 2;
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- else if (noside == EVAL_AVOID_SIDE_EFFECTS)
- return allocate_value (exp->elts[pc + 1].type);
- else
- error (_("Attempt to use a type name as an expression"));
+ return eval_op_type (expect_type, exp, noside, exp->elts[pc + 1].type);

case OP_TYPEOF:
case OP_DECLTYPE:
--
2.26.2