From aec95807f11b3403c1e8e000618bc85e0440799e 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_type This splits OP_TYPE into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * 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/ChangeLog b/gdb/ChangeLog index a7db97d1fc6..9bafa322e8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * eval.c (eval_op_type): New function. + (evaluate_subexp_standard): Use it. + 2021-03-08 Tom Tromey * eval.c (eval_op_postdec): New function. diff --git a/gdb/eval.c b/gdb/eval.c index d4d7f62eaf0..e62f9e5dba4 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2039,6 +2039,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, @@ -2994,12 +3008,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.30.2