From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 6BD633865C2D for ; Tue, 1 Feb 2022 14:07:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6BD633865C2D X-ASG-Debug-ID: 1643724437-0c856e06ab2cc4c0001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id AH35fShjQc2Hq5pB (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 01 Feb 2022 09:07:18 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id D271C441D64; Tue, 1 Feb 2022 09:07:17 -0500 (EST) From: Simon Marchi X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH 1/4] gdb: remove internalvar_funcs::destroy Date: Tue, 1 Feb 2022 09:07:14 -0500 X-ASG-Orig-Subj: [PATCH 1/4] gdb: remove internalvar_funcs::destroy Message-Id: <20220201140717.3046952-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201140717.3046952-1-simon.marchi@polymtl.ca> References: <20220201140717.3046952-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1643724438 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 3949 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.95723 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-3613.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 01 Feb 2022 14:07:23 -0000 No kind of internal var uses it remove it. This makes the transition to using a variant easier, since we don't need to think about where this should be called (in a destructor or not), if it can throw, etc. Change-Id: Iebbc867d1ce6716480450d9790410d6684cbe4dd --- gdb/break-catch-throw.c | 1 - gdb/inferior.c | 1 - gdb/infrun.c | 1 - gdb/probe.c | 1 - gdb/thread.c | 2 -- gdb/tracepoint.c | 1 - gdb/value.c | 5 ----- gdb/value.h | 6 ------ gdb/windows-tdep.c | 1 - 9 files changed, 19 deletions(-) diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index d34e5f9ee537..fcd644e6a5f4 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -510,7 +510,6 @@ static const struct internalvar_funcs exception_funcs = { compute_exception, NULL, - NULL }; diff --git a/gdb/inferior.c b/gdb/inferior.c index bebddb44173c..0457c7096eca 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -980,7 +980,6 @@ static const struct internalvar_funcs inferior_funcs = { inferior_id_make_value, NULL, - NULL }; diff --git a/gdb/infrun.c b/gdb/infrun.c index 2e7ed15723fd..483034884b5a 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -9366,7 +9366,6 @@ static const struct internalvar_funcs siginfo_funcs = { siginfo_make_value, NULL, - NULL }; /* Callback for infrun's target events source. This is marked when a diff --git a/gdb/probe.c b/gdb/probe.c index 278b36c3ce84..f0a40f5face1 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -866,7 +866,6 @@ static const struct internalvar_funcs probe_funcs = { compute_probe_arg, compile_probe_arg, - NULL }; diff --git a/gdb/thread.c b/gdb/thread.c index 611be3f4633a..b260a30882bc 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -2124,7 +2124,6 @@ static const struct internalvar_funcs thread_funcs = { thread_id_per_inf_num_make_value, NULL, - NULL }; /* Implementation of `gthread' variable. */ @@ -2133,7 +2132,6 @@ static const struct internalvar_funcs gthread_funcs = { global_thread_id_make_value, NULL, - NULL }; void _initialize_thread (); diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 506af3c527ec..c59d44ac74a4 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3985,7 +3985,6 @@ traceframe_available_memory (std::vector *result, static const struct internalvar_funcs sdata_funcs = { sdata_make_value, - NULL, NULL }; diff --git a/gdb/value.c b/gdb/value.c index 7bd9891b3e97..0ccc41b9278f 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -2449,11 +2449,6 @@ clear_internalvar (struct internalvar *var) xfree (var->u.string); break; - case INTERNALVAR_MAKE_VALUE: - if (var->u.make_value.functions->destroy != NULL) - var->u.make_value.functions->destroy (var->u.make_value.data); - break; - default: break; } diff --git a/gdb/value.h b/gdb/value.h index 0de4b5f3aefc..f7b29022d37c 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -1002,12 +1002,6 @@ struct internalvar_funcs struct agent_expr *expr, struct axs_value *value, void *data); - - /* If non-NULL, this is called to destroy DATA. The DATA argument - passed to this function is the same argument that was passed to - `create_internalvar_type_lazy'. */ - - void (*destroy) (void *data); }; extern struct internalvar *create_internalvar_type_lazy (const char *name, diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 13be3e4e461d..91fecd630d7c 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -970,7 +970,6 @@ static const struct internalvar_funcs tlb_funcs = { tlb_make_value, NULL, - NULL }; /* Layout of an element of a PE's Import Directory Table. Based on: -- 2.34.1