From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2LtOE5CY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:00 -0500 Received: by simark.ca (Postfix, from userid 112) id 76C4D1F0BE; Fri, 1 Jan 2021 16:47:58 -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 A5BAE1F0AA for ; Fri, 1 Jan 2021 16:47:57 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C4225388E83C; Fri, 1 Jan 2021 21:47:51 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 7A550388E821 for ; Fri, 1 Jan 2021 21:47:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7A550388E821 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 cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 1D57F400C8AA8 for ; Fri, 1 Jan 2021 15:47:48 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGykyO2Xsvw9vSGykLu3h; Fri, 01 Jan 2021 15:47:48 -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=jT9Z3NNu4BuBr6/BAYYDA4MPl4UORHDl15U10j9hk/Q=; b=HdlfaGi4yfCISaysStXbHqhOmH QS276DN+zlACu5n8rmuQbXeKatbWK7lLVHfKDSuvEtcz8xNMQELIz289mW5ZHGJ1R+wMfvnnTmDLD YID2PTkRf6YFgvj/1RD7wulK9; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60384 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 1kvSGx-0029E8-T3 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:47 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 045/203] Change parameters to rust_subscript Date: Fri, 1 Jan 2021 14:44:45 -0700 Message-Id: <20210101214723.1784144-46-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: 1kvSGx-0029E8-T3 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60384 X-Source-Auth: tom+tromey.com X-Email-Count: 46 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 changes the parameters to rust_subscript, making it more suitable for reuse by the (coming) new expression code. In particular, rust_subscript no longer evaluates its subexpressions. Instead, they are passed in. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (rust_subscript): Change parameters. (rust_evaluate_subexp): Update. --- gdb/ChangeLog | 5 +++++ gdb/rust-lang.c | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index c460d03172e..a635c8b8449 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1168,10 +1168,11 @@ rust_compute_range (struct type *type, struct value *range, /* A helper for rust_evaluate_subexp that handles BINOP_SUBSCRIPT. */ static struct value * -rust_subscript (struct expression *exp, int *pos, enum noside noside, - int for_addr) +rust_subscript (struct type *expect_type, struct expression *exp, + enum noside noside, bool for_addr, + struct value *lhs, struct value *rhs) { - struct value *lhs, *rhs, *result; + struct value *result; struct type *rhstype; LONGEST low, high_bound; /* Initialized to appease the compiler. */ @@ -1179,10 +1180,6 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside, LONGEST high = 0; int want_slice = 0; - ++*pos; - lhs = evaluate_subexp (nullptr, exp, pos, noside); - rhs = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) return lhs; @@ -1374,7 +1371,12 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, break; case BINOP_SUBSCRIPT: - result = rust_subscript (exp, pos, noside, 0); + { + ++*pos; + struct value *lhs = evaluate_subexp (nullptr, exp, pos, noside); + struct value *rhs = evaluate_subexp (nullptr, exp, pos, noside); + result = rust_subscript (expect_type, exp, noside, false, lhs, rhs); + } break; case OP_FUNCALL: @@ -1628,7 +1630,11 @@ tuple structs, and tuple-like enum variants")); if (exp->elts[*pos + 1].opcode == BINOP_SUBSCRIPT) { ++*pos; - result = rust_subscript (exp, pos, noside, 1); + ++*pos; + struct value *lhs = evaluate_subexp (nullptr, exp, pos, noside); + struct value *rhs = evaluate_subexp (nullptr, exp, pos, noside); + + result = rust_subscript (expect_type, exp, noside, true, lhs, rhs); break; } /* Fall through. */ -- 2.26.2