aboutsummaryrefslogtreecommitdiff
path: root/gdb/expop.h
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:43 -0700
commit0b2b0b8220f4430f83c49ca2da62f27b6b1964d1 (patch)
tree30730559a8bdaaa247e652e664df4b886d5d774b /gdb/expop.h
parent96db551d0627d1a3dcb5d0117a8b72e6c2658e0e (diff)
downloadgdb-0b2b0b8220f4430f83c49ca2da62f27b6b1964d1.zip
gdb-0b2b0b8220f4430f83c49ca2da62f27b6b1964d1.tar.gz
gdb-0b2b0b8220f4430f83c49ca2da62f27b6b1964d1.tar.bz2
Remove EVAL_SKIP
EVAL_SKIP was needed in the old expression implementation due to its linearized tree structure. This is not needed in the new implementation, because it is trivial to not evaluate a subexpression. This patch removes the last vestiges of EVAL_SKIP. gdb/ChangeLog 2021-03-08 Tom Tromey <tom@tromey.com> * value.h (eval_skip_value): Don't declare. * opencl-lang.c (eval_opencl_assign): Update. * m2-lang.c (eval_op_m2_high, eval_op_m2_subscript): Update. * f-lang.c (eval_op_f_abs, eval_op_f_mod, eval_op_f_ceil) (eval_op_f_floor, eval_op_f_modulo, eval_op_f_cmplx): Remove. * expression.h (enum noside) <EVAL_SKIP>: Remove. * expop.h (typeof_operation::evaluate) (decltype_operation::evaluate, unop_addr_operation::evaluate) (unop_sizeof_operation::evaluate, assign_operation::evaluate) (cxx_cast_operation::evaluate): Update. * eval.c (eval_skip_value): Remove. (eval_op_scope, eval_op_var_entry_value) (eval_op_func_static_var, eval_op_string, eval_op_objc_selector) (eval_op_concat, eval_op_ternop, eval_op_structop_struct) (eval_op_structop_ptr, eval_op_member, eval_op_add, eval_op_sub) (eval_op_binary, eval_op_subscript, eval_op_equal) (eval_op_notequal, eval_op_less, eval_op_gtr, eval_op_geq) (eval_op_leq, eval_op_repeat, eval_op_plus, eval_op_neg) (eval_op_complement, eval_op_lognot, eval_op_ind) (eval_op_memval, eval_op_preinc, eval_op_predec) (eval_op_postinc, eval_op_postdec, eval_op_type) (eval_binop_assign_modify, eval_op_objc_msgcall) (eval_multi_subscript, logical_and_operation::evaluate) (logical_or_operation::evaluate, array_operation::evaluate) (operation::evaluate_for_cast) (var_msym_value_operation::evaluate_for_cast) (var_value_operation::evaluate_for_cast): Update. * c-lang.c (c_string_operation::evaluate): Update. * c-exp.h (objc_nsstring_operation::evaluate) (objc_selector_operation::evaluate): Update. * ada-lang.c (ada_assign_operation::evaluate) (eval_ternop_in_range, ada_unop_neg, ada_unop_in_range) (ada_atr_size): Update.
Diffstat (limited to 'gdb/expop.h')
-rw-r--r--gdb/expop.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/gdb/expop.h b/gdb/expop.h
index a719b0d..c12a55e 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -1581,9 +1581,7 @@ public:
struct expression *exp,
enum noside noside) override
{
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
return std::get<0> (m_storage)->evaluate (nullptr, exp,
EVAL_AVOID_SIDE_EFFECTS);
else
@@ -1606,9 +1604,7 @@ public:
struct expression *exp,
enum noside noside) override
{
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
value *result
= std::get<0> (m_storage)->evaluate (nullptr, exp,
@@ -1683,10 +1679,7 @@ public:
enum noside noside) override
{
/* C++: check for and handle pointer to members. */
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- else
- return std::get<0> (m_storage)->evaluate_for_address (exp, noside);
+ return std::get<0> (m_storage)->evaluate_for_address (exp, noside);
}
enum exp_opcode opcode () const override
@@ -1724,8 +1717,6 @@ public:
struct expression *exp,
enum noside noside) override
{
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
return std::get<0> (m_storage)->evaluate_for_sizeof (exp, noside);
}
@@ -1908,7 +1899,7 @@ public:
: value_type (lhs));
value *rhs = std::get<1> (m_storage)->evaluate (xtype, exp, noside);
- if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+ if (noside == EVAL_AVOID_SIDE_EFFECTS)
return lhs;
if (binop_user_defined_p (BINOP_ASSIGN, lhs, rhs))
return value_x_binop (lhs, rhs, BINOP_ASSIGN, OP_NULL, noside);
@@ -2049,8 +2040,6 @@ public:
EVAL_AVOID_SIDE_EFFECTS);
struct type *type = value_type (val);
value *rhs = std::get<1> (m_storage)->evaluate (type, exp, noside);
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
return FUNC (type, rhs);
}