From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ecqpMUCL62nx5TgAWB0awg (envelope-from ) for ; Fri, 24 Apr 2026 11:24:48 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=FZ580prw; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id C6A9F1E067; Fri, 24 Apr 2026 11:24:48 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 08C421E067 for ; Fri, 24 Apr 2026 11:24:48 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id A9D0A4B920D1 for ; Fri, 24 Apr 2026 15:24:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9D0A4B920D1 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=FZ580prw Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id 861904BB592E for ; Fri, 24 Apr 2026 15:23:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 861904BB592E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 861904BB592E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::233 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777044202; cv=none; b=HLplcr+jBPPxJI5dMYyn94LXanjm/7RT6zVcIk/JqKbYK75k4hF2sH+N3vCbjSUOOavy784Svb6Z7nExxkXg2g6WOZ+1digWFDBBsCBwlQs4eynybHuTjtoQRTuR90/XQSe0nXNCraF5+Q6P7UuXPS5gx4+A0r/hWznzWQ7Ha+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777044202; c=relaxed/simple; bh=UZ13fKJ2yM+soV5vqRRFtC1wi9drJvczMoxZEzEXKEc=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=ZTKEJRJfqGHKnOqt5cMh/BaDwNakCyvqOQt5S4EN3u3HsuFn3R2x0x1yvDEcBVU4pxsLvhMMWezuecqgtdZxrM7CGuZPfoFYzLCTq59CuSDv4w/tTLbm9eTC0Khgdgo/+DoRsw2rURn2JyDcAcZBZmki3guldSCYpZ0U9s3im10= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 861904BB592E Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-479810de04bso2899626b6e.1 for ; Fri, 24 Apr 2026 08:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1777044202; x=1777649002; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Bg3ywed+3O1/+SZSROegzW4TL2Qn3PfZS2eT5405Rn8=; b=FZ580prwfQL5cjwBBjd04saJT80ggIEtLxbGEq3NyK1+uDF29dKnF2yTSlS+HSUVzv lqzt/zkMEHAj/i2AnYEjRWgQCKZkmQ461yX00cylEPg4E36hMKR8G3LnupYKrQvI3VCN UW8PEpm6POU5gtGL32i85CXveqLTRfbNyV2VL1FOS51g4WNM03sQQdHQq/iRNWSamxDr wT4qq2wJ1F7XRjCcSfVDr44T4VnMq05mSMxfmezwdsnvDTNsBvAE8g4cXTN2qe3lIU9B Wv6UjiApI8JhRdbUHmt3JqreWw4B5SfXUP6NMcbYj+7cSXBbuROmXBYQnNbm/hcSzdD8 fCaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777044202; x=1777649002; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Bg3ywed+3O1/+SZSROegzW4TL2Qn3PfZS2eT5405Rn8=; b=oqhfNGrwYs+jRDOAhJ0TKdb3uk6sljdJTKcyGUIqCSo9bd5KQ1ZxL97fb6KKRuPSJN Y/8ufZOvurRexqcDODnWBnvRwSO8qo6+lG8MTJES9LCTidPyowjZM62KIMpIdqSEhxdq gZyhw5NWSgqEoN0CztKajR0/GCobX3tlkxUY3gMZO1Q8e82OJOhz3NkTZ/XgD8gG1a9D ZMQ1+KxTxNrKUooDNe6iDmGM7HoGwutTnqYfhYLOk771kBcHz9yam5uTzP9qlVcYmZjA stPJvk81t5oE4/FjjjIVZECDhCkxTb9Jm5Ej6naR5NoipjBX4HISA49RHEmX4FTOvUR4 cyHA== X-Gm-Message-State: AOJu0YxYraFydUsagS0XVtqTb9kZUrlN9BKohg56IPt/IPgcrV3YgKgY iuxhiPKBKmQdqmuu8knvrajvcpyoRR3sqa8dJjeyY1XwxVQ4sAKAWsdjMshOfxGYcFVNoucJHWk 04II= X-Gm-Gg: AeBDieuy4KflKEnZCXG6q91TJDxN5XgF2/KmTE/ZvraeLJ9vipQNMswyjlTpNmYgL+b fpmthALTDp9hc6ANomYyN1rQ2tpFsHWzBaW/JHFJGj5MhpWV5I5ZiSyt8IM0e9TuDcwP6pJwjI6 +fVWErC0lLXSdnYpW7JzV3z9XCBxVLJrBFUq4qpe7aztI+tWasJuVi8u/ToWIt7luJcUbghJvuW pWZJ76aNlwF7pKdJusRr1GCg1Gkfg4nrUzGpryEqBXG6+pmakQrN2KzELVMmcKIiUXid2OEOeq8 ixKnQ0+yi0GQVX+v8Svlv7nqB5Ppmp+PGl36f5fO6a9EQQZiP1U2EUa3JR8xKBNvGA5LNuP1orH hBRKX8UglLC6b95M3CpwFc9sMAHJa4bO4j2crACeNTD6bViSVIjhjd/W1jJd6IUA04eRq5tzCcG NlhCQcHPbEJjxcwiIxFWynTSpbXZzEtS6ocytk1bVF0eAhxqDJFkK+aNASfSRvnSN4 X-Received: by 2002:a05:6808:4fec:b0:467:2509:c20a with SMTP id 5614622812f47-4799cb50f32mr17528310b6e.47.1777044201774; Fri, 24 Apr 2026 08:23:21 -0700 (PDT) Received: from [192.168.0.26] (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 5614622812f47-479a03ac624sm15947563b6e.18.2026.04.24.08.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 08:23:21 -0700 (PDT) From: Tom Tromey Date: Fri, 24 Apr 2026 09:23:20 -0600 Subject: [PATCH 2/2] C++-ify print_variable_and_value_data MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260424-print-var-and-cleanup-v1-2-7b6a2861ccb5@adacore.com> References: <20260424-print-var-and-cleanup-v1-0-7b6a2861ccb5@adacore.com> In-Reply-To: <20260424-print-var-and-cleanup-v1-0-7b6a2861ccb5@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org While working on a different patch, I decided to C++-ify print_variable_and_value_data somewhat. This patch gives it a constructor and changes it to use bool. Also, I noticed that this code does not really need to use a frame_id. Using a frame_info_ptr is just as good due to the "reinflation" behavior of that class. --- gdb/stack.c | 70 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/gdb/stack.c b/gdb/stack.c index 6fcc26417e2..8fabf6bea83 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2249,14 +2249,31 @@ iterate_over_block_local_vars (const struct block *block, struct print_variable_and_value_data { + print_variable_and_value_data (const char *regexp, + const char *t_regexp, + const frame_info_ptr &frame, + int num_tabs, + ui_file *stream) + : preg (prepare_reg (regexp)), + treg (prepare_reg (t_regexp)), + frame (frame), + num_tabs (num_tabs), + stream (stream) + { + } + std::optional preg; std::optional treg; - struct frame_id frame_id; + frame_info_ptr frame; int num_tabs; - struct ui_file *stream; - int values_printed; + ui_file *stream; + bool values_printed = false; void operator() (const char *print_name, struct symbol *sym); + +private: + + std::optional prepare_reg (const char *regexp); }; /* The callback for the locals and args iterators. */ @@ -2265,8 +2282,6 @@ void print_variable_and_value_data::operator() (const char *print_name, struct symbol *sym) { - frame_info_ptr frame; - if (preg.has_value () && preg->exec (sym->natural_name (), 0, NULL, 0) != 0) return; @@ -2276,32 +2291,25 @@ print_variable_and_value_data::operator() (const char *print_name, if (language_def (sym->language ())->symbol_printing_suppressed (sym)) return; - frame = frame_find_by_id (frame_id); - if (frame == NULL) - { - warning (_("Unable to restore previously selected frame.")); - return; - } - print_variable_and_value (print_name, sym, frame, stream, num_tabs); - values_printed = 1; + values_printed = true; } -/* Prepares the regular expression REG from REGEXP. - If REGEXP is NULL, it results in an empty regular expression. */ +/* Prepares a regular expression from REGEXP. If REGEXP is NULL, it + results in an empty object. */ -static void -prepare_reg (const char *regexp, std::optional *reg) +std::optional +print_variable_and_value_data::prepare_reg (const char *regexp) { - if (regexp != NULL) + std::optional result; + if (regexp != nullptr) { int cflags = REG_NOSUB | (case_sensitivity == case_sensitive_off ? REG_ICASE : 0); - reg->emplace (regexp, cflags, _("Invalid regexp")); + result.emplace (regexp, cflags, _("Invalid regexp")); } - else - reg->reset (); + return result; } /* Print all variables from the innermost up to the function block of FRAME. @@ -2319,7 +2327,6 @@ print_frame_local_vars (const frame_info_ptr &frame, const char *regexp, const char *t_regexp, int num_tabs, struct ui_file *stream) { - struct print_variable_and_value_data cb_data; const struct block *block; std::optional pc; @@ -2339,12 +2346,8 @@ print_frame_local_vars (const frame_info_ptr &frame, return; } - prepare_reg (regexp, &cb_data.preg); - prepare_reg (t_regexp, &cb_data.treg); - cb_data.frame_id = get_frame_id (frame); - cb_data.num_tabs = 4 * num_tabs; - cb_data.stream = stream; - cb_data.values_printed = 0; + print_variable_and_value_data cb_data (regexp, t_regexp, frame, + 4 * num_tabs, stream); /* Temporarily change the selected frame to the given FRAME. This allows routines that rely on the selected frame instead @@ -2481,8 +2484,6 @@ print_frame_arg_vars (const frame_info_ptr &frame, const char *regexp, const char *t_regexp, struct ui_file *stream) { - struct print_variable_and_value_data cb_data; - struct symbol *func; std::optional pc; if (!(pc = get_frame_pc_if_available (frame))) @@ -2493,7 +2494,7 @@ print_frame_arg_vars (const frame_info_ptr &frame, return; } - func = get_frame_function (frame); + symbol *func = get_frame_function (frame); if (func == NULL) { if (!quiet) @@ -2501,12 +2502,7 @@ print_frame_arg_vars (const frame_info_ptr &frame, return; } - prepare_reg (regexp, &cb_data.preg); - prepare_reg (t_regexp, &cb_data.treg); - cb_data.frame_id = get_frame_id (frame); - cb_data.num_tabs = 0; - cb_data.stream = stream; - cb_data.values_printed = 0; + print_variable_and_value_data cb_data (regexp, t_regexp, frame, 0, stream); iterate_over_block_arg_vars (func->value_block (), cb_data); -- 2.53.0