From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eI9oOtOY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:07 -0500 Received: by simark.ca (Postfix, from userid 112) id 984271F0C3; Fri, 1 Jan 2021 16:49:05 -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 2A7201F0BA for ; Fri, 1 Jan 2021 16:49:02 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB16D3896C09; Fri, 1 Jan 2021 21:48:35 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 078A2389683D for ; Fri, 1 Jan 2021 21:48:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 078A2389683D 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 A6CC5400C8F52 for ; Fri, 1 Jan 2021 15:48:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHekyOP8svw9vSHekLuPp; 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=DTVtpSkEQ5M2dq+LOu79ra/JZ1oTFNIuBL90yXSAUi4=; b=mRWig3crqDSKgfC8XLsjUnfSFB ChPa6iNBfSov7mVMKSSu2Aouz50wQLGd2hH+SrCkMPpV/D52jnIA5Ua4grVHbjPpGYC+XeTq4VDIN 9Y1jAWuwLR5N2cFWi0cYmTRMK; 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 1kvSHe-0029i1-E4 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:30 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 134/203] Implement Rust field operations Date: Fri, 1 Jan 2021 14:46:14 -0700 Message-Id: <20210101214723.1784144-135-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: 1kvSHe-0029i1-E4 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: 135 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 implements the field operations STRUCTOP_STRUCT and STRUCTOP_ANONYMOUS, for Rust. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (eval_op_rust_struct_anon, eval_op_rust_structop): No longer static. * rust-exp.h (class rust_struct_anon): New. (class rust_structop): New. --- gdb/ChangeLog | 7 +++++++ gdb/rust-exp.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ gdb/rust-lang.c | 4 ++-- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h index 263d41a79d4..19e945c806b 100644 --- a/gdb/rust-exp.h +++ b/gdb/rust-exp.h @@ -46,6 +46,16 @@ extern struct value *rust_range (struct type *expect_type, struct expression *exp, enum noside noside, enum range_flag kind, struct value *low, struct value *high); +extern struct value *eval_op_rust_struct_anon (struct type *expect_type, + struct expression *exp, + enum noside noside, + int field_number, + struct value *lhs); +extern struct value *eval_op_rust_structop (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *lhs, + const char *field_name); namespace expr { @@ -154,6 +164,49 @@ class rust_range_operation { return OP_RANGE; } }; +/* Tuple field reference (using an integer). */ +class rust_struct_anon + : 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 *lhs = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_rust_struct_anon (expect_type, exp, noside, + std::get<0> (m_storage), lhs); + + } + + enum exp_opcode opcode () const override + { return STRUCTOP_ANONYMOUS; } +}; + +/* Structure (or union or enum) field reference. */ +class rust_structop + : public structop_base_operation +{ +public: + + using structop_base_operation::structop_base_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_rust_structop (expect_type, exp, noside, lhs, + std::get<1> (m_storage).c_str ()); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_STRUCT; } +}; + } /* namespace expr */ #endif /* RUST_EXP_H */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 68fbaf1642a..95b19776edf 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1388,7 +1388,7 @@ eval_op_rust_array (struct type *expect_type, struct expression *exp, /* A helper function for STRUCTOP_ANONYMOUS. */ -static struct value * +struct value * eval_op_rust_struct_anon (struct type *expect_type, struct expression *exp, enum noside noside, int field_number, struct value *lhs) @@ -1455,7 +1455,7 @@ tuple structs, and tuple-like enum variants")); /* A helper function for STRUCTOP_STRUCT. */ -static struct value * +struct value * eval_op_rust_structop (struct type *expect_type, struct expression *exp, enum noside noside, struct value *lhs, const char *field_name) -- 2.26.2