From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [50.116.126.2]) by sourceware.org (Postfix) with ESMTPS id F08C53959E5F for ; Sat, 20 Feb 2021 20:16:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F08C53959E5F 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 gateway36.websitewelcome.com (Postfix) with ESMTP id 2E636400CBC54 for ; Sat, 20 Feb 2021 14:16:42 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgElmU9wDT64DYgElULl7; Sat, 20 Feb 2021 14:16:42 -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=x5Wnab1TbZCyMS8UKu42E3Ch5XnzdgwrfI0DimUsG6Q=; b=Q0SRvNH8E+eYHh5S4Z3+DCIB7U 5Uxz3AA3mmtHsRzaTYaQOg2w+nKzEqjMcxd0ZOSxkHweBio+wdMtOMEm8vkt4xu8oP3ksmOB8zaNq SdAa87VqQCA+yPQwUjEkuuzPv; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52698 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 1lDYgE-000Gha-08 for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 136/206] Introduce rust_aggregate_operation Date: Sat, 20 Feb 2021 13:14:59 -0700 Message-Id: <20210220201609.838264-137-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYgE-000Gha-08 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52698 X-Source-Auth: tom+tromey.com X-Email-Count: 137 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Sat, 20 Feb 2021 20:17:02 -0000 This adds class rust_aggregate_operation, which implements OP_AGGREGATE for Rust. gdb/ChangeLog 2021-02-20 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 1373de94035..3604535209d 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