From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 313C63896821 for ; Fri, 1 Jan 2021 21:48:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 313C63896821 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 cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id C8EAE107C2F9 for ; Fri, 1 Jan 2021 15:48:29 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHdkZEw8oE4DvSHdkuHL9; Fri, 01 Jan 2021 15:48:29 -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=qlC/7mR21PRvoHFh3R+/S2Qfr932XM4oM9+qO8Gn/BI=; b=D69nKNhcVS4+6zbppYlBQO7hqo oGQLi+ot5y1XpJEXfvd9Oz7ykTp1Dqc1SEXyZ61D5KhYDyJzw10S3mlh2ubt3FSkixzgm1d+8gVuD yUtyhyOOJuPvrP+R4M0pPO7Ij; 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-IF for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:29 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 131/203] Introduce rust_unop_ind_operation Date: Fri, 1 Jan 2021 14:46:11 -0700 Message-Id: <20210101214723.1784144-132-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-IF 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: 132 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Fri, 01 Jan 2021 21:48:31 -0000 This adds class rust_unop_ind_operation, which implements UNOP_IND for Rust. Rust requires a special case here to handle trait objects. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (eval_op_rust_ind): No longer static. Add "opcode" parameter. (rust_evaluate_subexp): Update. * rust-exp.h (class rust_unop_ind_operation): New. --- gdb/ChangeLog | 7 +++++++ gdb/rust-exp.h | 25 +++++++++++++++++++++++++ gdb/rust-lang.c | 5 +++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h index cce1fd9a7d9..d16f921ca00 100644 --- a/gdb/rust-exp.h +++ b/gdb/rust-exp.h @@ -33,6 +33,11 @@ extern struct value *eval_op_rust_array (struct type *expect_type, enum exp_opcode opcode, struct value *ncopies, struct value *elt); +extern struct value *eval_op_rust_ind (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode opcode, + struct value *value); namespace expr { @@ -42,6 +47,26 @@ using rust_unop_compl_operation = unop_operation; +/* The Rust indirection operation. */ +class rust_unop_ind_operation + : public unop_ind_operation +{ +public: + + using unop_ind_operation::unop_ind_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + if (noside != EVAL_NORMAL) + return unop_ind_operation::evaluate (expect_type, exp, noside); + + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_rust_ind (expect_type, exp, noside, UNOP_IND, arg1); + } +}; + } /* namespace expr */ #endif /* RUST_EXP_H */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 1305ee092fa..2c3f72ed404 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1325,9 +1325,10 @@ rust_subscript (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_IND. */ -static struct value * +struct value * eval_op_rust_ind (struct type *expect_type, struct expression *exp, enum noside noside, + enum exp_opcode opcode, struct value *value) { gdb_assert (noside == EVAL_NORMAL); @@ -1521,7 +1522,7 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, ++*pos; struct value *value = evaluate_subexp (expect_type, exp, pos, noside); - result = eval_op_rust_ind (expect_type, exp, noside, value); + result = eval_op_rust_ind (expect_type, exp, noside, op, value); } } break; -- 2.26.2