From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rA6yNNjCvWpBVSEAWB0awg (envelope-from ) for ; Wed, 30 Sep 2026 22:18:00 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=wdWo1ZkG; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 945B61E090; Wed, 30 Sep 2026 22:18:00 -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 2AB531E033 for ; Wed, 30 Sep 2026 22:17:59 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 56F0B4BB58F7 for ; Thu, 1 Oct 2026 02:17:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 56F0B4BB58F7 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=wdWo1ZkG Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 360EC4BA9036 for ; Thu, 1 Oct 2026 02:17:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 360EC4BA9036 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 360EC4BA9036 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790821027; cv=none; b=DKvKaJncCiMzBcgZ54qw9fLnVNjx6WWSXZrsp+ZoP63lItu0JEFDaWCvlOOJFrLQH065lm6lzvxWNmV7uULL/L4k6MW4MoPhMnvdvDjC4cpgO2SK6+KrwZEE4I3Uwzqj92OkU8v4PjkRD2rb9TThDzyHVQl9wSrqxOJE8LW6ApU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790821027; c=relaxed/simple; bh=sDjVx1d17AqPKkgjisqwBnixgS8J7WVF7VHO5TAG3KQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qz62xBwMmDH2aGDzJ8RS72y6M/kz5thelJ9FTb64kOowWomby6b5SNNqo4Qe5R4OnB7BhGarBcGFLT5HC4VGhzqetaK2NwWRHlIdOFrpT01ctxTmzyqtb7zFrvBVeZYV/lSgC5UAoxRWLNffJAcP625eXYb3P7TepNrMYiD2rF8= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=wdWo1ZkG DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 360EC4BA9036 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 6912H1qe169619 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Sep 2026 22:17:06 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 6912H1qe169619 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1790821026; bh=fcU65MaaloIHy21JJK+xB2NCnS/zgpfX2t36sDGzbRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=wdWo1ZkGajWFcnYBDdEmvllVCMSTxN6KtELhBJa1qSH4peb7Xl1xNWxFjiluHAG+d 6aMeY8KJNL2Xi2a/oB17t1ToVYyGXfIiti1PqwTcq/nqU8fdoHuxwJ4ASV9tfxNQIh xrGrbpeSVfxH2aEuqBa0ZBdXlU2fsCuTnl4EqLOOJyX9CabETxsTyMKEy0fc2TGGOO 13xvZ2I1lh7hgepq+QYHFot6fsq6T0srdGmrWlAJ1yjRbaKKFzfTfJT+l0VhAScB8b 238iq3JreiYseEiBF7M89bY+kK9Hy9USVicFQGj26IZ9E6bZGTYL+C9zvUk0p0NRCZ cNupCqncLbb/g== Received: by simark.ca (Postfix) id 827211E091; Wed, 30 Sep 2026 22:09:55 -0400 (EDT) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 04/11] gdb: use compile_symbol_search_regex in stack.c Date: Wed, 30 Sep 2026 22:09:21 -0400 Message-ID: <20261001020952.698419-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260929194119.155169-1-simon.marchi@efficios.com> References: <20260929194119.155169-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Thu, 1 Oct 2026 02:17:01 +0000 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 From: Simon Marchi prepare_reg in stack.c does the same thing as compile_symbol_search_regex in symtab.c, but with an awkward output parameter. Expose compile_symbol_search_regex in symtab.h and use it instead of prepare_reg. Since compiled_regex is not movable, the optionals in print_variable_and_value_data must be initialized directly from the return value of compile_symbol_search_regex. Add a constructor to print_variable_and_value_data to do so. Make the constructor initialize the other fields as well, instead of assigning them after construction. Change-Id: I69939bba3488a888ef17b4d5ec71d5a9efe83dda --- gdb/stack.c | 51 ++++++++++++++++++--------------------------------- gdb/symtab.c | 6 ++---- gdb/symtab.h | 8 ++++++++ 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/gdb/stack.c b/gdb/stack.c index 79a67865affe..c6466e2cb799 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2289,13 +2289,24 @@ iterate_over_block_local_vars_printing struct print_variable_and_value_data { + print_variable_and_value_data (const char *regexp, const char *t_regexp, + frame_id frame_id, int num_tabs, + ui_file *stream, bool print_shadowed) + : name_regex (compile_symbol_search_regex (regexp)), + type_regex (compile_symbol_search_regex (t_regexp)), + frame_id (frame_id), + num_tabs (num_tabs), + stream (stream), + print_shadowed (print_shadowed) + {} + std::optional name_regex; std::optional type_regex; struct frame_id frame_id; int num_tabs; struct ui_file *stream; - int values_printed; - bool print_shadowed = true; + int values_printed = 0; + bool print_shadowed; bool printed_shadowed_variables = false; bool omitted_shadowed_variables = false; @@ -2344,22 +2355,6 @@ print_variable_and_value_data::operator() (const char *print_name, printed_shadowed_variables = true; } -/* Prepares the regular expression REG from REGEXP. - If REGEXP is NULL, it results in an empty regular expression. */ - -static void -prepare_reg (const char *regexp, std::optional *reg) -{ - if (regexp != NULL) - { - int cflags = REG_NOSUB | (case_sensitivity == case_sensitive_off - ? REG_ICASE : 0); - reg->emplace (regexp, cflags, _("Invalid regexp")); - } - else - reg->reset (); -} - /* Print all variables from the innermost up to the function block of FRAME. Print them with values to STREAM indented by NUM_TABS. PRINT_SHADOWED controls whether shadowed variables are printed. @@ -2379,7 +2374,6 @@ print_frame_local_vars (const frame_info_ptr &frame, 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; @@ -2399,13 +2393,9 @@ print_frame_local_vars (const frame_info_ptr &frame, return; } - prepare_reg (regexp, &cb_data.name_regex); - prepare_reg (t_regexp, &cb_data.type_regex); - cb_data.frame_id = get_frame_id (frame); - cb_data.num_tabs = 4 * num_tabs; - cb_data.stream = stream; - cb_data.values_printed = 0; - cb_data.print_shadowed = print_shadowed; + print_variable_and_value_data cb_data (regexp, t_regexp, + get_frame_id (frame), 4 * num_tabs, + stream, print_shadowed); /* Temporarily change the selected frame to the given FRAME. This allows routines that rely on the selected frame instead @@ -2572,7 +2562,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; @@ -2592,12 +2581,8 @@ print_frame_arg_vars (const frame_info_ptr &frame, return; } - prepare_reg (regexp, &cb_data.name_regex); - prepare_reg (t_regexp, &cb_data.type_regex); - 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, + get_frame_id (frame), 0, stream, true); iterate_over_block_arg_vars (func->value_block (), [&] (const char *print_name, symbol *sym) diff --git a/gdb/symtab.c b/gdb/symtab.c index 49e8719f4ec0..2c63f9456bc3 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4938,11 +4938,9 @@ global_symbol_searcher::add_matching_msymbols return true; } -/* Compile REGEXP, a symbol name or symbol type regexp. - - If REGEXP is nullptr, return an empty optional. */ +/* See symtab.h. */ -static std::optional +std::optional compile_symbol_search_regex (const char *regexp) { if (regexp == nullptr) diff --git a/gdb/symtab.h b/gdb/symtab.h index e60b32230239..de8cf40974e0 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2604,6 +2604,14 @@ enum class symbol_search_kind MODULE, }; +/* Compile REGEXP, a regexp used to match symbol names or types. The regexp + is case-insensitive if case sensitivity is off. + + If REGEXP is nullptr, return an empty optional. */ + +extern std::optional compile_symbol_search_regex + (const char *regexp); + /* In order to search for global symbols of a particular kind matching particular regular expressions, create an instance of this structure and call the SEARCH member function. */ -- 2.55.0