From patchwork Thu Feb 9 21:38:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64564 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1DB493888C47 for ; Thu, 9 Feb 2023 21:40:05 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id EE3AD385842C for ; Thu, 9 Feb 2023 21:38:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE3AD385842C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 5324C10042D11 for ; Thu, 9 Feb 2023 21:38:41 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QEcrpzBOaP796QEcrpwoW6; Thu, 09 Feb 2023 21:38:41 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=MJClJOVl c=1 sm=1 tr=0 ts=63e567e1 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=G3ECseQddodGc2JpXMUA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=6+hityIQ8A7uKy3XF4jVnE1MlQv2I6vRi11pYUmQi/g=; b=oUvpT5qbv+jodyAUHC78N9mwBv FohQl7lKFI1ipZKoRrPkNDAgPJPZxMr/UaiyO/5zcAfeDLlhasUBc9eB1mHZiOhBSqsSaq1+lgbXI eTUumZk6lqDFVGYZweGLm8xMO; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:52822 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pQEcr-001ZcE-5V for gdb-patches@sourceware.org; Thu, 09 Feb 2023 14:38:41 -0700 From: Tom Tromey Date: Thu, 09 Feb 2023 14:38:32 -0700 Subject: [PATCH 11/47] Turn deprecated_value_modifiable into method MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v1-11-55dc2794dbb9@tromey.com> References: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.0 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: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pQEcr-001ZcE-5V X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:52822 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes deprecated_value_modifiable to be a method of value. --- gdb/ada-lang.c | 4 ++-- gdb/breakpoint.c | 2 +- gdb/opencl-lang.c | 2 +- gdb/ppc-linux-nat.c | 2 +- gdb/valops.c | 2 +- gdb/value.c | 5 ----- gdb/value.h | 12 ++++++------ 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index c660e74e08c..5aec8b77b14 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2888,7 +2888,7 @@ ada_value_assign (struct value *toval, struct value *fromval) if (ada_is_direct_array_type (fromval->type ())) fromval = ada_coerce_to_simple_array (fromval); - if (!deprecated_value_modifiable (toval)) + if (!toval->deprecated_modifiable ()) error (_("Left operand of assignment is not a modifiable lvalue.")); if (VALUE_LVAL (toval) == lval_memory @@ -9531,7 +9531,7 @@ ada_aggregate_operation::assign_aggregate (struct value *container, if (ada_is_direct_array_type (container->type ())) container = ada_coerce_to_simple_array (container); lhs = ada_coerce_ref (lhs); - if (!deprecated_value_modifiable (lhs)) + if (!lhs->deprecated_modifiable ()) error (_("Left operand of assignment is not a modifiable lvalue.")); lhs_type = check_typedef (lhs->type ()); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1c56b353e27..492b0ef7941 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10421,7 +10421,7 @@ can_use_hardware_watchpoint (const std::vector &vals) } } else if (VALUE_LVAL (v) != not_lval - && deprecated_value_modifiable (v) == 0) + && v->deprecated_modifiable () == 0) return 0; /* These are values from the history (e.g., $1). */ else if (VALUE_LVAL (v) == lval_register) return 0; /* Cannot watch a register with a HW watchpoint. */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 107a138ff7c..8c59e823d5c 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -687,7 +687,7 @@ eval_opencl_assign (struct type *expect_type, struct expression *exp, return arg1; struct type *type1 = arg1->type (); - if (deprecated_value_modifiable (arg1) + if (arg1->deprecated_modifiable () && VALUE_LVAL (arg1) != lval_internalvar) arg2 = opencl_value_cast (type1, arg2); diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index cb832726ea5..a796364b413 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -2455,7 +2455,7 @@ ppc_linux_nat_target::num_memory_accesses (const std::vector struct value *v = iter.get (); /* Constants and values from the history are fine. */ - if (VALUE_LVAL (v) == not_lval || deprecated_value_modifiable (v) == 0) + if (VALUE_LVAL (v) == not_lval || v->->deprecated_modifiable () == 0) continue; else if (VALUE_LVAL (v) == lval_memory) { diff --git a/gdb/valops.c b/gdb/valops.c index 276c171f0bc..d0ef2b952c3 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1089,7 +1089,7 @@ value_assign (struct value *toval, struct value *fromval) struct value *val; struct frame_id old_frame; - if (!deprecated_value_modifiable (toval)) + if (!toval->deprecated_modifiable ()) error (_("Left operand of assignment is not a modifiable lvalue.")); toval = coerce_ref (toval); diff --git a/gdb/value.c b/gdb/value.c index 64c1bf03956..eca340cad80 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1385,11 +1385,6 @@ deprecated_value_regnum_hack (struct value *value) return &value->m_location.reg.regnum; } -int -deprecated_value_modifiable (const struct value *value) -{ - return value->m_modifiable; -} /* Return a mark in the value chain. All values allocated after the mark is obtained (except for those released) are subject to being freed diff --git a/gdb/value.h b/gdb/value.h index d79455cc345..360e8c5bc33 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -210,6 +210,12 @@ struct value void set_offset (LONGEST offset) { m_offset = offset; } + /* The comment from "struct value" reads: ``Is it modifiable? Only + relevant if lval != not_lval.''. Shouldn't the value instead be + not_lval and be done with it? */ + int deprecated_modifiable () const + { return m_modifiable; } + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -377,12 +383,6 @@ struct value std::vector m_optimized_out; }; -/* The comment from "struct value" reads: ``Is it modifiable? Only - relevant if lval != not_lval.''. Shouldn't the value instead be - not_lval and be done with it? */ - -extern int deprecated_value_modifiable (const struct value *value); - /* If a value represents a C++ object, then the `type' field gives the object's compile-time type. If the object actually belongs to some class derived from `type', perhaps with other base classes and