From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id IAZeHKCY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:16 -0500 Received: by simark.ca (Postfix, from userid 112) id 9F0401F0C0; Fri, 1 Jan 2021 16:48:13 -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.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 290AC1F0BA for ; Fri, 1 Jan 2021 16:48:12 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C1742389245E; Fri, 1 Jan 2021 21:48:03 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 000863846035 for ; Fri, 1 Jan 2021 21:47:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 000863846035 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 9F9F1BEC5D6 for ; Fri, 1 Jan 2021 15:47:57 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSH7kzawVDT64vSH7k790I; Fri, 01 Jan 2021 15:47:57 -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=DDnX/JmQcVr9l3W9MxLnzsD2dvXi8r1FXkDqsn/AOtI=; b=RkBxP4GV7ykdrEM740FEtcoeCw mNJGDKFl9bKJizRTZln0zEF3AeWxuR3jRz1QGOSr/EPLJV4FYb7Th1R7nWoi9uJlMRgIYBN6Ty01N cXYD3ZZ35PCeKawnakrm2dvD4; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60388 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 1kvSH7-0029JW-Er for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:57 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 071/203] Split out eval_multi_subscript Date: Fri, 1 Jan 2021 14:45:11 -0700 Message-Id: <20210101214723.1784144-72-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: 1kvSH7-0029JW-Er X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60388 X-Source-Auth: tom+tromey.com X-Email-Count: 72 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" This splits MULTI_SUBSCRIPT into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_multi_subscript): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 ++++ gdb/eval.c | 75 ++++++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 8af14fc723b..421cfb8e393 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2335,6 +2335,46 @@ eval_op_objc_msgcall (struct type *expect_type, struct expression *exp, return call_function_by_hand (called_method, NULL, args); } +/* Helper function for MULTI_SUBSCRIPT. */ + +static struct value * +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)) + { + arg1 = value_x_binop (arg1, arg2, MULTI_SUBSCRIPT, OP_NULL, noside); + } + else + { + arg1 = coerce_ref (arg1); + struct type *type = check_typedef (value_type (arg1)); + + switch (type->code ()) + { + case TYPE_CODE_PTR: + case TYPE_CODE_ARRAY: + case TYPE_CODE_STRING: + arg1 = value_subscript (arg1, value_as_long (arg2)); + break; + + default: + if (type->name ()) + error (_("cannot subscript something of type `%s'"), + type->name ()); + else + error (_("cannot subscript requested type")); + } + } + } + return (arg1); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2790,39 +2830,8 @@ evaluate_subexp_standard (struct type *expect_type, argvec = XALLOCAVEC (struct value *, nargs); for (ix = 0; ix < nargs; ++ix) argvec[ix] = evaluate_subexp_with_coercion (exp, pos, noside); - if (noside == EVAL_SKIP) - return arg1; - for (ix = 0; ix < nargs; ++ix) - { - arg2 = argvec[ix]; - - if (binop_user_defined_p (op, arg1, arg2)) - { - arg1 = value_x_binop (arg1, arg2, op, OP_NULL, noside); - } - else - { - arg1 = coerce_ref (arg1); - type = check_typedef (value_type (arg1)); - - switch (type->code ()) - { - case TYPE_CODE_PTR: - case TYPE_CODE_ARRAY: - case TYPE_CODE_STRING: - arg1 = value_subscript (arg1, value_as_long (arg2)); - break; - - default: - if (type->name ()) - error (_("cannot subscript something of type `%s'"), - type->name ()); - else - error (_("cannot subscript requested type")); - } - } - } - return (arg1); + return eval_multi_subscript (expect_type, exp, noside, arg1, + gdb::make_array_view (argvec, nargs)); case BINOP_LOGICAL_AND: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2