From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UJwbB9SY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:08 -0500 Received: by simark.ca (Postfix, from userid 112) id 155F21F0B7; Fri, 1 Jan 2021 16:49:08 -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 B711A1F0C0 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 0343C3896C1B; Fri, 1 Jan 2021 21:48:36 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id A6C5C389682E for ; Fri, 1 Jan 2021 21:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A6C5C389682E 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 514863186D for ; Fri, 1 Jan 2021 15:48:33 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHhk114wiQiZvSHhki8GF; Fri, 01 Jan 2021 15:48:33 -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=qvkPs+SFZwMSzL410DP0B9ZfDNExE4T5/g8Bw7TBXXQ=; b=kwCQk/+KqRVa4YRiubicRLvZwH icv91w+3mFMCYZmrjlw3e3jNFiRm9riPPvPdvawyf8xxrdxYIQk+DaqyUqBlXg6gLvysRgR1oLdDB LgRCUzRbuhvX6nqWQI8T1b7vT; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60414 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 1kvSHh-0029lU-43 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:33 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 135/203] Introduce rust_aggregate_operation Date: Fri, 1 Jan 2021 14:46:15 -0700 Message-Id: <20210101214723.1784144-136-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: 1kvSHh-0029lU-43 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60414 X-Source-Auth: tom+tromey.com X-Email-Count: 136 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_aggregate_operation, which implements OP_AGGREGATE for Rust. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (rust_aggregate_operation::evaluate): New method. * rust-exp.h (class rust_aggregate_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/rust-exp.h | 18 +++++++++++++++ gdb/rust-lang.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h index 19e945c806b..6e529f8e600 100644 --- a/gdb/rust-exp.h +++ b/gdb/rust-exp.h @@ -207,6 +207,24 @@ class rust_structop { return STRUCTOP_STRUCT; } }; +/* Rust aggregate initialization. */ +class rust_aggregate_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; + + enum exp_opcode opcode () const override + { return OP_AGGREGATE; } +}; + } /* namespace expr */ #endif /* RUST_EXP_H */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 95b19776edf..992319ffd2b 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1700,6 +1700,64 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, return result; } +namespace expr +{ + +value * +rust_aggregate_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + struct type *type = std::get<0> (m_storage); + CORE_ADDR addr = 0; + struct value *addrval = NULL; + value *result; + + if (noside == EVAL_NORMAL) + { + addrval = value_allocate_space_in_inferior (TYPE_LENGTH (type)); + addr = value_as_long (addrval); + result = value_at_lazy (type, addr); + } + + if (std::get<1> (m_storage) != nullptr) + { + struct value *init = std::get<1> (m_storage)->evaluate (nullptr, exp, + noside); + + if (noside == EVAL_NORMAL) + { + /* This isn't quite right but will do for the time + being, seeing that we can't implement the Copy + trait anyway. */ + value_assign (result, init); + } + } + + for (const auto &item : std::get<2> (m_storage)) + { + value *val = item.second->evaluate (nullptr, exp, noside); + if (noside == EVAL_NORMAL) + { + const char *fieldname = item.first.c_str (); + value *field = value_struct_elt (&result, nullptr, fieldname, + nullptr, "structure"); + value_assign (field, val); + } + } + + if (noside == EVAL_SKIP) + result = value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1); + else if (noside == EVAL_AVOID_SIDE_EFFECTS) + result = allocate_value (type); + else + result = value_at_lazy (type, addr); + + return result; +} + +} + /* operator_length implementation for Rust. */ static void -- 2.26.2