From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uN7xDQqZ718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:50:02 -0500 Received: by simark.ca (Postfix, from userid 112) id 2E3CE1F071; Fri, 1 Jan 2021 16:50:01 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E68D41F0CD for ; Fri, 1 Jan 2021 16:49:48 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09E98393C032; Fri, 1 Jan 2021 21:49:15 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 18651393BC0B for ; Fri, 1 Jan 2021 21:49:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 18651393BC0B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id AF3D531A65 for ; Fri, 1 Jan 2021 15:49:06 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSIEk11P4iQiZvSIEki8aA; Fri, 01 Jan 2021 15:49:06 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Hfp5lQ032hT/lvkCEQnsI6KSlEBDyV2Fzq7RXlNEA94=; b=jIAEjPipltnJgmYre2O57Bqz7u aKGDvPRoue2pOKSRF0Bk9gJCgdNN/H6EsBpVIcThDAh9LzL3UKWlNA5ZN79Cc86bFOEaIKICb/nX/ wbusEuvx4wZ+WnD72CTpeO4C1; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60430 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kvSIE-002A5T-Fz for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:49:06 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 200/203] Remove EVAL_SKIP Date: Fri, 1 Jan 2021 14:47:20 -0700 Message-Id: <20210101214723.1784144-201-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.81.39 X-Source-L: No X-Exim-ID: 1kvSIE-002A5T-Fz X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60430 X-Source-Auth: tom+tromey.com X-Email-Count: 201 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" 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-01-01 Tom Tromey * 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) : 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. --- gdb/ChangeLog | 36 ++++++++++++++++ gdb/ada-lang.c | 16 ++----- gdb/c-exp.h | 4 -- gdb/c-lang.c | 21 ++-------- gdb/eval.c | 103 ++++------------------------------------------ gdb/expop.h | 19 ++------- gdb/expression.h | 3 -- gdb/f-lang.c | 12 ------ gdb/m2-lang.c | 4 +- gdb/opencl-lang.c | 2 +- gdb/value.h | 2 - 11 files changed, 57 insertions(+), 165 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 4331a063cb0..4ab9172cc81 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -9509,7 +9509,7 @@ ada_assign_operation::evaluate (struct type *expect_type, if (VALUE_LVAL (arg1) == lval_internalvar) type = NULL; value *arg2 = std::get<1> (m_storage)->evaluate (type, exp, noside); - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; if (VALUE_LVAL (arg1) == lval_internalvar) { @@ -9843,9 +9843,6 @@ eval_ternop_in_range (struct type *expect_type, struct expression *exp, enum noside noside, value *arg1, value *arg2, value *arg3) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); struct type *type = language_bool_type (exp->language_defn, exp->gdbarch); @@ -9865,9 +9862,7 @@ ada_unop_neg (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - else if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1))) + if (ada_is_gnat_encoded_fixed_point_type (value_type (arg1))) return value_cast (value_type (arg1), value_neg (arg1)); else { @@ -9884,9 +9879,6 @@ ada_unop_in_range (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1, struct type *type) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - struct value *arg2, *arg3; switch (type->code ()) { @@ -9943,9 +9935,7 @@ ada_atr_size (struct type *expect_type, if (type->code () == TYPE_CODE_REF) type = TYPE_TARGET_TYPE (type); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - else if (noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (builtin_type (exp->gdbarch)->builtin_int, not_lval); else return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, diff --git a/gdb/c-exp.h b/gdb/c-exp.h index 0ce2bd6eb22..1a69b1c7960 100644 --- a/gdb/c-exp.h +++ b/gdb/c-exp.h @@ -74,8 +74,6 @@ class objc_nsstring_operation struct expression *exp, enum noside noside) override { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); const std::string &str = std::get<0> (m_storage); return value_nsstring (exp->gdbarch, str.c_str (), str.size () + 1); } @@ -95,8 +93,6 @@ class objc_selector_operation struct expression *exp, enum noside noside) override { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); return eval_op_objc_selector (expect_type, exp, noside, std::get<0> (m_storage).c_str ()); } diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 5dd27329726..36fc4fcad5c 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -638,24 +638,9 @@ c_string_operation::evaluate (struct type *expect_type, dest_charset = charset_for_string_type (dest_type, exp->gdbarch); - if (noside != EVAL_SKIP) - { - for (const std::string &item : std::get<1> (m_storage)) - parse_one_string (&output, item.c_str (), item.size (), - dest_charset, type); - } - - if (noside == EVAL_SKIP) - { - /* Return a dummy value of the appropriate type. */ - if (expect_type != NULL) - result = allocate_value (expect_type); - else if ((dest_type & C_CHAR) != 0) - result = allocate_value (type); - else - result = value_cstring ("", 0, type); - return result; - } + for (const std::string &item : std::get<1> (m_storage)) + parse_one_string (&output, item.c_str (), item.size (), + dest_charset, type); if ((dest_type & C_CHAR) != 0) { diff --git a/gdb/eval.c b/gdb/eval.c index 4d467cd436d..49e53f930b9 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -603,14 +603,6 @@ evaluate_var_msym_value (enum noside noside, return value_at_lazy (the_type, address); } -/* Helper for returning a value when handling EVAL_SKIP. */ - -value * -eval_skip_value (expression *exp) -{ - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1); -} - /* See expression.h. */ value * @@ -984,8 +976,6 @@ eval_op_scope (struct type *expect_type, struct expression *exp, enum noside noside, struct type *type, const char *string) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct value *arg1 = value_aggregate_elt (type, string, expect_type, 0, noside); if (arg1 == NULL) @@ -999,8 +989,6 @@ struct value * eval_op_var_entry_value (struct type *expect_type, struct expression *exp, enum noside noside, symbol *sym) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (SYMBOL_TYPE (sym), not_lval); @@ -1032,8 +1020,6 @@ eval_op_func_static_var (struct type *expect_type, struct expression *exp, enum noside noside, value *func, const char *var) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); CORE_ADDR addr = value_address (func); const block *blk = block_for_pc (addr); struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL); @@ -1074,8 +1060,6 @@ struct value * eval_op_string (struct type *expect_type, struct expression *exp, enum noside noside, int len, const char *string) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = language_string_char_type (exp->language_defn, exp->gdbarch); return value_string (string, len, type); @@ -1086,9 +1070,6 @@ eval_op_objc_selector (struct type *expect_type, struct expression *exp, enum noside noside, const char *sel) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - struct type *selector_type = builtin_type (exp->gdbarch)->builtin_data_ptr; return value_from_longest (selector_type, lookup_child_selector (exp->gdbarch, sel)); @@ -1098,8 +1079,6 @@ struct value * eval_op_concat (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (BINOP_CONCAT, arg1, arg2)) return value_x_binop (arg1, arg2, BINOP_CONCAT, OP_NULL, noside); else @@ -1113,8 +1092,6 @@ eval_op_ternop (struct type *expect_type, struct expression *exp, enum noside noside, struct value *array, struct value *low, struct value *upper) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); int lowbound = value_as_long (low); int upperbound = value_as_long (upper); return value_slice (array, lowbound, upperbound - lowbound + 1); @@ -1127,8 +1104,6 @@ eval_op_structop_struct (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, const char *string) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct value *arg3 = value_struct_elt (&arg1, NULL, string, NULL, "structure"); if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -1143,9 +1118,6 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, const char *string) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - /* Check to see if operator '->' has been overloaded. If so replace arg1 with the value returned by evaluating operator->(). */ while (unop_user_defined_p (STRUCTOP_PTR, arg1)) @@ -1204,9 +1176,6 @@ eval_op_member (struct type *expect_type, struct expression *exp, { long mem_offset; - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - struct value *arg3; struct type *type = check_typedef (value_type (arg2)); switch (type->code ()) @@ -1245,8 +1214,6 @@ eval_op_add (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (BINOP_ADD, arg1, arg2)) return value_x_binop (arg1, arg2, BINOP_ADD, OP_NULL, noside); else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) @@ -1269,8 +1236,6 @@ eval_op_sub (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (BINOP_SUB, arg1, arg2)) return value_x_binop (arg1, arg2, BINOP_SUB, OP_NULL, noside); else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) @@ -1297,8 +1262,6 @@ eval_op_binary (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL, noside); else @@ -1344,8 +1307,6 @@ eval_op_subscript (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL, noside); else @@ -1380,8 +1341,6 @@ eval_op_equal (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1403,8 +1362,6 @@ eval_op_notequal (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1426,8 +1383,6 @@ eval_op_less (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1449,8 +1404,6 @@ eval_op_gtr (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1472,8 +1425,6 @@ eval_op_geq (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1495,8 +1446,6 @@ eval_op_leq (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (binop_user_defined_p (op, arg1, arg2)) { return value_x_binop (arg1, arg2, op, OP_NULL, noside); @@ -1518,8 +1467,6 @@ eval_op_repeat (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = check_typedef (value_type (arg2)); if (type->code () != TYPE_CODE_INT && type->code () != TYPE_CODE_ENUM) @@ -1540,8 +1487,6 @@ eval_op_plus (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (unop_user_defined_p (op, arg1)) return value_x_unop (arg1, op, noside); else @@ -1558,8 +1503,6 @@ eval_op_neg (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (unop_user_defined_p (op, arg1)) return value_x_unop (arg1, op, noside); else @@ -1576,8 +1519,6 @@ eval_op_complement (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (unop_user_defined_p (UNOP_COMPLEMENT, arg1)) return value_x_unop (arg1, UNOP_COMPLEMENT, noside); else @@ -1594,8 +1535,6 @@ eval_op_lognot (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (unop_user_defined_p (op, arg1)) return value_x_unop (arg1, op, noside); else @@ -1618,8 +1557,6 @@ eval_op_ind (struct type *expect_type, struct expression *exp, || type->code () == TYPE_CODE_MEMBERPTR) error (_("Attempt to dereference pointer " "to member without an object")); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (unop_user_defined_p (UNOP_IND, arg1)) return value_x_unop (arg1, UNOP_IND, noside); else if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -1673,8 +1610,6 @@ eval_op_memval (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct type *type) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (type, lval_memory); else @@ -1688,7 +1623,7 @@ eval_op_preinc (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; else if (unop_user_defined_p (op, arg1)) { @@ -1719,7 +1654,7 @@ eval_op_predec (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; else if (unop_user_defined_p (op, arg1)) { @@ -1750,7 +1685,7 @@ eval_op_postinc (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; else if (unop_user_defined_p (op, arg1)) { @@ -1784,7 +1719,7 @@ eval_op_postdec (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; else if (unop_user_defined_p (op, arg1)) { @@ -1817,9 +1752,7 @@ 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) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return allocate_value (type); else error (_("Attempt to use a type name as an expression")); @@ -1832,7 +1765,7 @@ eval_binop_assign_modify (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); @@ -2082,8 +2015,6 @@ eval_op_objc_msgcall (struct type *expect_type, struct expression *exp, called_method = msg_send; } - if (noside == EVAL_SKIP) - return eval_skip_value (exp); if (noside == EVAL_AVOID_SIDE_EFFECTS) { @@ -2139,8 +2070,6 @@ eval_multi_subscript (struct type *expect_type, struct expression *exp, enum noside noside, value *arg1, gdb::array_view args) { - if (noside == EVAL_SKIP) - return arg1; for (value *arg2 : args) { if (binop_user_defined_p (MULTI_SUBSCRIPT, arg1, arg2)) @@ -2228,8 +2157,6 @@ logical_and_operation::evaluate (struct type *expect_type, enum noside noside) { value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, EVAL_AVOID_SIDE_EFFECTS); @@ -2259,8 +2186,6 @@ logical_or_operation::evaluate (struct type *expect_type, enum noside noside) { value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, EVAL_AVOID_SIDE_EFFECTS); @@ -2385,7 +2310,7 @@ array_operation::evaluate (struct type *expect_type, int nargs = tem3 - tem2 + 1; struct type *type = expect_type ? check_typedef (expect_type) : nullptr; - if (expect_type != nullptr && noside != EVAL_SKIP + if (expect_type != nullptr && type->code () == TYPE_CODE_STRUCT) { struct value *rec = allocate_value (expect_type); @@ -2394,7 +2319,7 @@ array_operation::evaluate (struct type *expect_type, return evaluate_struct_tuple (rec, exp, noside, nargs); } - if (expect_type != nullptr && noside != EVAL_SKIP + if (expect_type != nullptr && type->code () == TYPE_CODE_ARRAY) { struct type *range_type = type->index_type (); @@ -2430,7 +2355,7 @@ array_operation::evaluate (struct type *expect_type, return array; } - if (expect_type != nullptr && noside != EVAL_SKIP + if (expect_type != nullptr && type->code () == TYPE_CODE_SET) { struct value *set = allocate_value (expect_type); @@ -2503,8 +2428,6 @@ array_operation::evaluate (struct type *expect_type, objects. */ argvec[tem] = in_args[tem]->evaluate_with_coercion (exp, noside); } - if (noside == EVAL_SKIP) - return eval_skip_value (exp); return value_array (tem2, tem3, argvec); } @@ -2543,8 +2466,6 @@ operation::evaluate_for_cast (struct type *expect_type, enum noside noside) { value *val = evaluate (expect_type, exp, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); return value_cast (expect_type, val); } @@ -2810,9 +2731,6 @@ var_msym_value_operation::evaluate_for_cast (struct type *to_type, std::get<1> (m_storage), std::get<0> (m_storage)); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - val = value_cast (to_type, val); /* Don't allow e.g. '&(int)var_with_no_debug_info'. */ @@ -2834,9 +2752,6 @@ var_value_operation::evaluate_for_cast (struct type *to_type, std::get<1> (m_storage), std::get<0> (m_storage)); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - val = value_cast (to_type, val); /* Don't allow e.g. '&(int)var_with_no_debug_info'. */ diff --git a/gdb/expop.h b/gdb/expop.h index 7449ef60562..0abe6dac90b 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -1569,9 +1569,7 @@ class typeof_operation 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 @@ -1594,9 +1592,7 @@ class decltype_operation 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, @@ -1671,10 +1667,7 @@ class unop_addr_operation 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 @@ -1706,8 +1699,6 @@ class unop_sizeof_operation 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); } @@ -1890,7 +1881,7 @@ class assign_operation : 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); @@ -2031,8 +2022,6 @@ class cxx_cast_operation 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); } diff --git a/gdb/expression.h b/gdb/expression.h index 83bfe753d84..244f4e8ad33 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -54,9 +54,6 @@ enum exp_opcode : uint8_t enum noside { EVAL_NORMAL, - EVAL_SKIP, /* Only effect is to increment pos. - Return type information where - possible. */ EVAL_AVOID_SIDE_EFFECTS /* Don't modify any variables or call any functions. The value returned will have the correct diff --git a/gdb/f-lang.c b/gdb/f-lang.c index f86f961e7bb..bf828d536f3 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -272,8 +272,6 @@ eval_op_f_abs (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = value_type (arg1); switch (type->code ()) { @@ -302,8 +300,6 @@ eval_op_f_mod (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = value_type (arg1); if (type->code () != value_type (arg2)->code ()) error (_("non-matching types for parameters to MOD ()")); @@ -341,8 +337,6 @@ eval_op_f_ceil (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = value_type (arg1); if (type->code () != TYPE_CODE_FLT) error (_("argument to CEILING must be of type float")); @@ -361,8 +355,6 @@ eval_op_f_floor (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = value_type (arg1); if (type->code () != TYPE_CODE_FLT) error (_("argument to FLOOR must be of type float")); @@ -381,8 +373,6 @@ eval_op_f_modulo (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = value_type (arg1); if (type->code () != value_type (arg2)->code ()) error (_("non-matching types for parameters to MODULO ()")); @@ -423,8 +413,6 @@ eval_op_f_cmplx (struct type *expect_type, struct expression *exp, enum exp_opcode opcode, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); struct type *type = builtin_f_type(exp->gdbarch)->builtin_complex_s16; return value_literal_complex (arg1, arg2, type); } diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index a165cf6b603..6f6192937a4 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -37,7 +37,7 @@ eval_op_m2_high (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; else { @@ -68,8 +68,6 @@ eval_op_m2_subscript (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP) - return eval_skip_value (exp); /* If the user attempts to subscript something that is not an array or pointer type (like a plain int variable for example), then report this as an error. */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index c168cd49344..1d6117a9285 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -681,7 +681,7 @@ eval_opencl_assign (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) + if (noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; struct type *type1 = value_type (arg1); diff --git a/gdb/value.h b/gdb/value.h index 88995cfeafe..59036b070aa 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -923,8 +923,6 @@ extern value *evaluate_var_msym_value (enum noside noside, struct objfile *objfile, minimal_symbol *msymbol); -extern value *eval_skip_value (expression *exp); - namespace expr { class operation; }; extern void fetch_subexp_value (struct expression *exp, expr::operation *op, -- 2.26.2