From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SPUfDNCY718XTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:04 -0500 Received: by simark.ca (Postfix, from userid 112) id 2B0B71F0C3; Fri, 1 Jan 2021 16:49:04 -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 F37C51E590 for ; Fri, 1 Jan 2021 16:49:00 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9EA55389682A; Fri, 1 Jan 2021 21:48:33 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 781F63896832 for ; Fri, 1 Jan 2021 21:48:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 781F63896832 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 1AB0E400C8F5B for ; Fri, 1 Jan 2021 15:48:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHekyOOmsvw9vSHekLuPX; Fri, 01 Jan 2021 15:48:30 -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=ZJzieW9w4hR4s5Nz6dJrLKntpx32ucYYiEHsBlZ3z/o=; b=UtgGAnRGSU754iq1HuSLI3jhtJ QFl8sWqsd+Sz7Lvd4M6nRDPKIrux74zKgLhMuc6oS46CBBmtcMSuNlMiPQMO92OW8uJ5ThMOyMCFB Mc8BQURIMKGxg3O/jDyzLLg/h; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60412 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 1kvSHd-0029i1-RS for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:29 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 132/203] Introduce rust_subscript_operation Date: Fri, 1 Jan 2021 14:46:12 -0700 Message-Id: <20210101214723.1784144-133-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: 1kvSHd-0029i1-RS X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60412 X-Source-Auth: tom+tromey.com X-Email-Count: 133 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 adds class rust_subscript_operation, which implements BINOP_SUBSCRIPT for Rust. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (rust_subscript): No longer static. * rust-exp.h (class rust_subscript_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/rust-exp.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ gdb/rust-lang.c | 2 +- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h index d16f921ca00..7571009ea39 100644 --- a/gdb/rust-exp.h +++ b/gdb/rust-exp.h @@ -38,6 +38,10 @@ extern struct value *eval_op_rust_ind (struct type *expect_type, enum noside noside, enum exp_opcode opcode, struct value *value); +extern struct value *rust_subscript (struct type *expect_type, + struct expression *exp, + enum noside noside, bool for_addr, + struct value *lhs, struct value *rhs); namespace expr { @@ -67,6 +71,59 @@ class rust_unop_ind_operation } }; +/* Subscript operator for Rust. */ +class rust_subscript_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return rust_subscript (expect_type, exp, noside, false, arg1, arg2); + } + + value *slice (struct type *expect_type, + struct expression *exp, + enum noside noside) + { + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return rust_subscript (expect_type, exp, noside, true, arg1, arg2); + } + + enum exp_opcode opcode () const override + { return BINOP_SUBSCRIPT; } +}; + +class rust_unop_addr_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + operation *oper = std::get<0> (m_storage).get (); + rust_subscript_operation *sub_op + = dynamic_cast (oper); + if (sub_op != nullptr) + return sub_op->slice (expect_type, exp, noside); + return oper->evaluate_for_address (exp, noside); + } + + enum exp_opcode opcode () const override + { return UNOP_ADDR; } +}; + } /* namespace expr */ #endif /* RUST_EXP_H */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 2c3f72ed404..0035a58adc4 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1168,7 +1168,7 @@ rust_compute_range (struct type *type, struct value *range, /* A helper for rust_evaluate_subexp that handles BINOP_SUBSCRIPT. */ -static struct value * +struct value * rust_subscript (struct type *expect_type, struct expression *exp, enum noside noside, bool for_addr, struct value *lhs, struct value *rhs) -- 2.26.2