From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QPphCZGY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:01 -0500 Received: by simark.ca (Postfix, from userid 112) id CF3E71F0BC; Fri, 1 Jan 2021 16:48:00 -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 679F11E590 for ; Fri, 1 Jan 2021 16:47:57 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 777EF388E81D; Fri, 1 Jan 2021 21:47:51 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 98D31388E823 for ; Fri, 1 Jan 2021 21:47:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 98D31388E823 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 3FCC9400C8AC2 for ; Fri, 1 Jan 2021 15:47:48 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGykyO2csvw9vSGykLu3o; Fri, 01 Jan 2021 15:47:48 -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=jsjYWJS6qOlvMF6Ba++ZMlIWWaq3pTWD1UdulGDrOW4=; b=AmD/n4cbrp8Z4+RPHFIYadRAei QaWUuQ9Cqu3/kT9dftbUc7L96KKpRJCdZ8wlrFp7Sg1A8i3xl8F+q7QOaBCubWS2rptW9Slv9zEf0 iAR2gEd1K3SXPj65E4uq7Lzx5; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60384 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 1kvSGy-0029E8-2e for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:48 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 046/203] Split out eval_op_rust_ind Date: Fri, 1 Jan 2021 14:44:46 -0700 Message-Id: <20210101214723.1784144-47-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: 1kvSGy-0029E8-2e X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60384 X-Source-Auth: tom+tromey.com X-Email-Count: 47 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 splits UNOP_IND into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (eval_op_rust_ind): New function. (rust_evaluate_subexp): Use it. --- gdb/ChangeLog | 5 +++++ gdb/rust-lang.c | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index a635c8b8449..16a8bd18d23 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1322,6 +1322,21 @@ rust_subscript (struct type *expect_type, struct expression *exp, return result; } +/* A helper function for UNOP_IND. */ + +static struct value * +eval_op_rust_ind (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *value) +{ + gdb_assert (noside == EVAL_NORMAL); + struct value *trait_ptr = rust_get_trait_object_pointer (value); + if (trait_ptr != NULL) + value = trait_ptr; + + return value_ind (value); +} + /* evaluate_exp implementation for Rust. */ static struct value * @@ -1341,12 +1356,7 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp, ++*pos; struct value *value = evaluate_subexp (expect_type, exp, pos, noside); - - struct value *trait_ptr = rust_get_trait_object_pointer (value); - if (trait_ptr != NULL) - value = trait_ptr; - - result = value_ind (value); + result = eval_op_rust_ind (expect_type, exp, noside, value); } } break; -- 2.26.2