From patchwork Fri Feb 10 21:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64734 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 F198A3888C72 for ; Fri, 10 Feb 2023 23:22:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from qproxy1-pub.mail.unifiedlayer.com (qproxy1-pub.mail.unifiedlayer.com [173.254.64.10]) by sourceware.org (Postfix) with ESMTPS id 103D338493CA for ; Fri, 10 Feb 2023 23:22:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 103D338493CA 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 gproxy4-pub.mail.unifiedlayer.com (unknown [69.89.23.142]) by qproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id 45BB48030439 for ; Fri, 10 Feb 2023 23:22:01 +0000 (UTC) Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 168EA1004C138 for ; Fri, 10 Feb 2023 23:21:31 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QchvpODGWVjzQQchvpYpeK; Fri, 10 Feb 2023 23:21:31 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=bt2JuGWi c=1 sm=1 tr=0 ts=63e6d17b 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=7d_E57ReAAAA:8 a=JCnJhiDBTAdtJNuVAs8A:9 a=QEXdDO2ut3YA:10:nop_charset_2 a=jhqOcbufqs7Y1TYCrUUU:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=JxOnfhOGKUUKX96QemJQ7rKWhA++P3+nCVUmkBAJwE0=; b=RGNS+6VDSNTvUJrphO06o4Nqr9 dxjKF/cZJRfDpDBpwPky/K4vCkS8MCUhZS9hkxy8vCd3ookoYJDacCPkJ6/5MQzh1j8gU+RH6earz LR6Eaxjf0F+DNkkhr3GlMquXL; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:57244 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 1pQbJs-000WcR-R7; Fri, 10 Feb 2023 14:52:36 -0700 From: Tom Tromey Date: Fri, 10 Feb 2023 14:52:50 -0700 Subject: [PATCH v2 32/48] Turn value_incref and value_decref into methods MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v2-32-b0b27fd97177@tromey.com> References: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> To: gdb-patches@sourceware.org Cc: Simon Marchi 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: 1pQbJs-000WcR-R7 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]:57244 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.5 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 value_incref and value_decref to be methods of value. Much of this patch was written by script. Approved-By: Simon Marchi --- gdb/dwarf2/expr.c | 4 ++-- gdb/dwarf2/loc.c | 6 +++--- gdb/guile/scm-value.c | 4 ++-- gdb/opencl-lang.c | 4 ++-- gdb/python/py-value.c | 4 ++-- gdb/value.c | 23 ++++++----------------- gdb/value.h | 21 ++++++++++----------- 7 files changed, 27 insertions(+), 39 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index ef93b89aaa9..f2a1305713a 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -128,7 +128,7 @@ allocate_piece_closure (dwarf2_per_cu_data *per_cu, for (dwarf_expr_piece &piece : c->pieces) if (piece.location == DWARF_VALUE_STACK) - value_incref (piece.v.value); + piece.v.value->incref (); return c; } @@ -620,7 +620,7 @@ free_pieced_value_closure (value *v) { for (dwarf_expr_piece &p : c->pieces) if (p.location == DWARF_VALUE_STACK) - value_decref (p.v.value); + p.v.value->decref (); delete c; } diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 0aa6aafe823..64a7e035b06 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -1280,7 +1280,7 @@ entry_data_value_coerce_ref (const struct value *value) return NULL; target_val = (struct value *) value->computed_closure (); - value_incref (target_val); + target_val->incref (); return target_val; } @@ -1291,7 +1291,7 @@ entry_data_value_copy_closure (const struct value *v) { struct value *target_val = (struct value *) v->computed_closure (); - value_incref (target_val); + target_val->incref (); return target_val; } @@ -1302,7 +1302,7 @@ entry_data_value_free_closure (struct value *v) { struct value *target_val = (struct value *) v->computed_closure (); - value_decref (target_val); + target_val->decref (); } /* Vector for methods for an entry value reference where the referenced value diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index 195fd3b8912..09b1ce30024 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -131,7 +131,7 @@ vlscm_free_value_smob (SCM self) value_smob *v_smob = (value_smob *) SCM_SMOB_DATA (self); vlscm_forget_value_smob (v_smob); - value_decref (v_smob->value); + v_smob->value->decref (); return 0; } @@ -272,7 +272,7 @@ vlscm_scm_from_value_no_release (struct value *value) SCM v_scm = vlscm_make_value_smob (); value_smob *v_smob = (value_smob *) SCM_SMOB_DATA (v_scm); - value_incref (value); + value->incref (); v_smob->value = value; vlscm_remember_scheme_value (v_smob); diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index e4a88a23d49..81889b97e95 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -110,7 +110,7 @@ allocate_lval_closure (int *indices, int n, struct value *val) c->n = n; c->indices = XCNEWVEC (int, n); memcpy (c->indices, indices, n * sizeof (int)); - value_incref (val); /* Increment the reference counter of the value. */ + val->incref (); /* Increment the reference counter of the value. */ c->val = val; return c; @@ -242,7 +242,7 @@ lval_func_free_closure (struct value *v) if (c->refc == 0) { - value_decref (c->val); /* Decrement the reference counter of the value. */ + c->val->decref (); /* Decrement the reference counter of the value. */ xfree (c->indices); xfree (c); } diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 465d8d92bd2..c2db2d58b0d 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -81,7 +81,7 @@ static void valpy_clear_value (value_object *self) { /* Indicate we are no longer interested in the value object. */ - value_decref (self->value); + self->value->decref (); self->value = nullptr; Py_CLEAR (self->address); @@ -1806,7 +1806,7 @@ value_to_value_object_no_release (struct value *val) val_obj = PyObject_New (value_object, &value_object_type); if (val_obj != NULL) { - value_incref (val); + val->incref (); val_obj->value = val; val_obj->next = nullptr; val_obj->prev = nullptr; diff --git a/gdb/value.c b/gdb/value.c index 9e5f865b46c..3109025ac93 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1318,28 +1318,17 @@ value_mark (void) return all_values.back ().get (); } -/* See value.h. */ - -void -value_incref (struct value *val) -{ - val->m_reference_count++; -} - /* Release a reference to VAL, which was acquired with value_incref. This function is also called to deallocate values from the value chain. */ void -value_decref (struct value *val) +value::decref () { - if (val != nullptr) - { - gdb_assert (val->m_reference_count > 0); - val->m_reference_count--; - if (val->m_reference_count == 0) - delete val; - } + gdb_assert (m_reference_count > 0); + m_reference_count--; + if (m_reference_count == 0) + delete this; } /* Free all values allocated since MARK was obtained by value_mark @@ -2146,7 +2135,7 @@ clear_internalvar (struct internalvar *var) switch (var->kind) { case INTERNALVAR_VALUE: - value_decref (var->u.value); + var->u.value->decref (); break; case INTERNALVAR_STRING: diff --git a/gdb/value.h b/gdb/value.h index ebb933eb5b5..55bba45c549 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -111,15 +111,6 @@ struct range } }; -/* Increase VAL's reference count. */ - -extern void value_incref (struct value *val); - -/* Decrease VAL's reference count. When the reference count drops to - 0, VAL will be freed. */ - -extern void value_decref (struct value *val); - /* A policy class to interface gdb::ref_ptr with struct value. */ struct value_ref_policy @@ -452,6 +443,14 @@ struct value int bits_synthetic_pointer (LONGEST offset, LONGEST length) const; + /* Increase this value's reference count. */ + void incref () + { ++m_reference_count; } + + /* Decrease this value's reference count. When the reference count + drops to 0, it will be freed. */ + void decref (); + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -637,13 +636,13 @@ struct value inline void value_ref_policy::incref (struct value *ptr) { - value_incref (ptr); + ptr->incref (); } inline void value_ref_policy::decref (struct value *ptr) { - value_decref (ptr); + ptr->decref (); } /* Returns value_type or value_enclosing_type depending on