From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id D324A3842402 for ; Fri, 1 Jan 2021 21:47:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D324A3842402 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 cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 744482B89A for ; Fri, 1 Jan 2021 15:47:45 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGvkJAGkuDoAvSGvkccCR; Fri, 01 Jan 2021 15:47:45 -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=MIsca8FoXOfWdb+ikrEm8XqQDjuh2jxyBU2s+HOD+CU=; b=mqjjGqnfOS6mkwnWpfta6/q/ZD X2bWGymObABNJ+Bti7VLlYQCl4nYzA6ZGevv/ZON+SvG5WOiz/wB2+BfTUoaYPMrVioGhks20MIMt a1bRnoIiwVod/8xiwh+lsmcsZ; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60382 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 1kvSGv-0029BJ-8I for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:45 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 044/203] Change parameters to rust_range Date: Fri, 1 Jan 2021 14:44:44 -0700 Message-Id: <20210101214723.1784144-45-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: 1kvSGv-0029BJ-8I X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60382 X-Source-Auth: tom+tromey.com X-Email-Count: 45 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3033.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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:47:47 -0000 This changes the parameters to rust_range, making it more suitable for reuse by the (coming) new expression code. In particular, rust_range no longer evaluates its subexpressions. Instead, they are passed in. gdb/ChangeLog 2021-01-01 Tom Tromey * rust-lang.c (rust_range): Change parameters. (rust_evaluate_subexp): Update. --- gdb/ChangeLog | 5 +++++ gdb/rust-lang.c | 27 ++++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index e9827ff15f7..c460d03172e 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1041,9 +1041,10 @@ rust_evaluate_funcall (struct expression *exp, int *pos, enum noside noside) /* A helper for rust_evaluate_subexp that handles OP_RANGE. */ static struct value * -rust_range (struct expression *exp, int *pos, enum noside noside) +rust_range (struct type *expect_type, struct expression *exp, + enum noside noside, enum range_flag kind, + struct value *low, struct value *high) { - struct value *low = NULL, *high = NULL; struct value *addrval, *result; CORE_ADDR addr; struct type *range_type; @@ -1051,14 +1052,6 @@ rust_range (struct expression *exp, int *pos, enum noside noside) struct type *temp_type; const char *name; - auto kind - = (enum range_flag) longest_to_int (exp->elts[*pos + 1].longconst); - *pos += 3; - - if (!(kind & RANGE_LOW_BOUND_DEFAULT)) - low = evaluate_subexp (nullptr, exp, pos, noside); - if (!(kind & RANGE_HIGH_BOUND_DEFAULT)) - high = evaluate_subexp (nullptr, exp, pos, noside); bool inclusive = !(kind & RANGE_HIGH_BOUND_EXCLUSIVE); if (noside == EVAL_SKIP) @@ -1614,7 +1607,19 @@ tuple structs, and tuple-like enum variants")); break; case OP_RANGE: - result = rust_range (exp, pos, noside); + { + struct value *low = NULL, *high = NULL; + auto kind + = (enum range_flag) longest_to_int (exp->elts[*pos + 1].longconst); + *pos += 3; + + if (!(kind & RANGE_LOW_BOUND_DEFAULT)) + low = evaluate_subexp (nullptr, exp, pos, noside); + if (!(kind & RANGE_HIGH_BOUND_DEFAULT)) + high = evaluate_subexp (nullptr, exp, pos, noside); + + result = rust_range (expect_type, exp, noside, kind, low, high); + } break; case UNOP_ADDR: -- 2.26.2