From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id DDxKDF7VWWpXGA4AWB0awg (envelope-from ) for ; Fri, 17 Jul 2026 03:10:22 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 200671E09E; Fri, 17 Jul 2026 03:10:22 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 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 3319C1E099 for ; Fri, 17 Jul 2026 03:10:19 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9D3B04BA2E1C for ; Fri, 17 Jul 2026 07:10:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D3B04BA2E1C Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 83FC64BA2E10 for ; Fri, 17 Jul 2026 07:09:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83FC64BA2E10 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 83FC64BA2E10 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784272193; cv=none; b=A2meMBKnCDcqmrjGlOn5u98WDx0C5rVM6HlwnKFk7+TAFzy3H3G3ZFsVowOiUV7yvU0l+cjJT+WDNF4LPr6k2GNQGoQrJdiqgtrOFDDaRZJziUr3cBnYHXzVosHxx58WlotiAwpXITYy6NCH6EZRvSjMfNUY92cXUtXRbPjqwJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784272193; c=relaxed/simple; bh=L6Ka1FeGWUQE5b2+KDb3nFOdGlZ/XlWHYx0IoC40LOs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=YjjUDyXLsve2TAC7u4L6HvzWZ28lFZ0ga9kJH9gY3tdq5nTZcXuufhf1FK/i/vPPVFdd5LKcMqqcAz4Gfph+8tUfBFpUakURb5z5L3Bn3D5ISIpAP44DMvBH4O/+dNJ/1VFgHG49EzFzDCL+PRvQk86AhuPALiGheDp5N2tOVdI= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Rnh/qXYc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0fb2wrlv DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83FC64BA2E10 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id F38E578D85 for ; Fri, 17 Jul 2026 07:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1784272192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Y7YhGZoNIvpxvgova6lzCl08cbYg8VdUaYjDkIArjSQ=; b=Rnh/qXYczPyyod/0KtFuExH90IivTZPxzLEAO05PXrywleBMAKIU81ZMlmQVZW9+4vfu3B JOaUoe/1svKN3kJ0XfAPovV47HK4DOPS5JtxUot0EwxzRT544DU7H4R1cfLuHZR5RWv3vd nw8to9M1qO3YOQRBTzmaJy1v6UoMasU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1784272192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Y7YhGZoNIvpxvgova6lzCl08cbYg8VdUaYjDkIArjSQ=; b=0fb2wrlvGJBBMDn/5ZPYIQJC1Gq+SPIar6G1dmWTX5CbPSbn+HAT05KGMtUizKoITDG0jc OahYQ4XuMXbl+OBw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="Rnh/qXYc"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=0fb2wrlv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1784272192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Y7YhGZoNIvpxvgova6lzCl08cbYg8VdUaYjDkIArjSQ=; b=Rnh/qXYczPyyod/0KtFuExH90IivTZPxzLEAO05PXrywleBMAKIU81ZMlmQVZW9+4vfu3B JOaUoe/1svKN3kJ0XfAPovV47HK4DOPS5JtxUot0EwxzRT544DU7H4R1cfLuHZR5RWv3vd nw8to9M1qO3YOQRBTzmaJy1v6UoMasU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1784272192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Y7YhGZoNIvpxvgova6lzCl08cbYg8VdUaYjDkIArjSQ=; b=0fb2wrlvGJBBMDn/5ZPYIQJC1Gq+SPIar6G1dmWTX5CbPSbn+HAT05KGMtUizKoITDG0jc OahYQ4XuMXbl+OBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E06EB779AA for ; Fri, 17 Jul 2026 07:09:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id as+VNT/VWWq7cQAAD6G6ig (envelope-from ) for ; Fri, 17 Jul 2026 07:09:51 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb] Add default argument for get_selected_block Date: Fri, 17 Jul 2026 09:09:51 +0200 Message-ID: <20260717070951.1442033-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: F38E578D85 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 I noticed that the get_selected_block argument is mostly 0, NULL, or nullptr. Make nullptr the default argument. --- gdb/ada-exp.y | 2 +- gdb/ada-lang.c | 6 +++--- gdb/cp-support.c | 6 +++--- gdb/eval.c | 4 ++-- gdb/f-valprint.c | 2 +- gdb/frame.h | 3 ++- gdb/linespec.c | 2 +- gdb/printcmd.c | 4 ++-- gdb/rust-lang.c | 2 +- gdb/symtab.c | 2 +- gdb/valops.c | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index f36426a2084..a79d0ca83cb 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1342,7 +1342,7 @@ write_object_renaming (struct parser_state *par_state, error (_("Could not find renamed symbol")); if (orig_left_context == NULL) - orig_left_context = get_selected_block (NULL); + orig_left_context = get_selected_block (); name = obstack_strndup (&ada_parser->temp_space, renamed_entity, renamed_entity_len); diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 85b08af8c06..6ec99447d34 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -7412,7 +7412,7 @@ field_alignment (struct type *type, int f) static struct symbol * ada_find_any_type_symbol (const char *name) { - return standard_lookup (name, get_selected_block (nullptr), + return standard_lookup (name, get_selected_block (), SEARCH_TYPE_DOMAIN); } @@ -11425,7 +11425,7 @@ get_var_value (const char *name, const char *err_msg) std::vector syms = ada_lookup_symbol_list_worker (lookup_name, - get_selected_block (0), + get_selected_block (), SEARCH_VFT, true); if (syms.size () != 1) @@ -13741,7 +13741,7 @@ class ada_language : public language_defn /* Search upwards from currently selected frame (so that we can complete on local vars. */ - for (const block *b = get_selected_block (0); + for (const block *b = get_selected_block (); b != nullptr; b = b->superblock ()) { diff --git a/gdb/cp-support.c b/gdb/cp-support.c index c684d1a1723..335e06a039f 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -1322,7 +1322,7 @@ add_symbol_overload_list_namespace (const char *func_name, } /* Look in the static block. */ - block = get_selected_block (0); + block = get_selected_block (); block = block == nullptr ? nullptr : block->static_block (); if (block != nullptr) { @@ -1414,7 +1414,7 @@ add_symbol_overload_list_using (const char *func_name, look in the appropriate namespaces for new functions to match on. */ - for (block = get_selected_block (0); + for (block = get_selected_block (); block != NULL; block = block->superblock ()) for (using_direct *current : block->get_using ()) @@ -1454,7 +1454,7 @@ static void add_symbol_overload_list_qualified (const char *func_name, std::vector *overload_list) { - const block *selected_block = get_selected_block (0); + const block *selected_block = get_selected_block (); /* Search upwards from currently selected frame (so that we can complete on local vars. */ diff --git a/gdb/eval.c b/gdb/eval.c index 7e07765c9e6..6b2218cc629 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -753,7 +753,7 @@ scope_operation::evaluate_funcall (struct type *expect_type, { function = cp_lookup_symbol_namespace (type->name (), name.c_str (), - get_selected_block (0), + get_selected_block (), SEARCH_FUNCTION_DOMAIN).symbol; if (function == NULL) error (_("No symbol \"%s\" in namespace \"%s\"."), @@ -799,7 +799,7 @@ scope_operation::evaluate_funcall (struct type *expect_type, find_overload_match (arg_view, nullptr, NON_METHOD, nullptr, function, nullptr, &symp, nullptr, 1, noside); - callee = value_of_variable (symp, get_selected_block (0)); + callee = value_of_variable (symp, get_selected_block ()); } return evaluate_subexp_do_call (exp, noside, callee, arg_view, diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index 8a383281a6c..dcefc577425 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -551,7 +551,7 @@ f_language::value_print_inner (struct value *val, struct ui_file *stream, /* While printing namelist items, fetch the appropriate value field before printing its value. */ struct block_symbol sym - = lookup_symbol (field_name, get_selected_block (nullptr), + = lookup_symbol (field_name, get_selected_block (), SEARCH_VFT, nullptr); if (sym.symbol == nullptr) error (_("failed to find symbol for name list component %s"), diff --git a/gdb/frame.h b/gdb/frame.h index f6553fb7b6d..7ee85fd9851 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -881,7 +881,8 @@ extern const struct block *get_frame_block (const frame_info_ptr &, it occurs in the CLI code and makes it possible for commands to work, even when the inferior has no state. */ -extern const struct block *get_selected_block (CORE_ADDR *addr_in_block); +extern const struct block *get_selected_block (CORE_ADDR *addr_in_block + = nullptr); extern struct symbol *get_frame_function (const frame_info_ptr &); diff --git a/gdb/linespec.c b/gdb/linespec.c index fd7918df5a1..b6505ba283d 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1184,7 +1184,7 @@ get_current_search_block (void) /* get_selected_block can change the current language when there is no selected frame yet. */ scoped_restore_current_language save_language; - return get_selected_block (0); + return get_selected_block (); } /* Iterate over static and global blocks. */ diff --git a/gdb/printcmd.c b/gdb/printcmd.c index a337a6b7db9..662f43fbef8 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -2123,7 +2123,7 @@ do_one_display (struct display *d) if (d->block) { if (d->pspace == current_program_space) - within_current_scope = d->block->contains (get_selected_block (0), + within_current_scope = d->block->contains (get_selected_block (), true); else within_current_scope = 0; @@ -2289,7 +2289,7 @@ Num Enb Expression\n")); else if (d->format.format) gdb_printf ("/%c ", d->format.format); gdb_puts (d->exp_string.c_str ()); - if (d->block && !d->block->contains (get_selected_block (0), true)) + if (d->block && !d->block->contains (get_selected_block (), true)) gdb_printf (_(" (cannot be evaluated in the current context)")); gdb_printf ("\n"); } diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 517d6333d12..2a95c03178a 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1746,7 +1746,7 @@ rust_structop::evaluate_funcall (struct type *expect_type, std::string name = (std::string (type->name ()) + "::" + std::get<1> (m_storage)); - const struct block *block = get_selected_block (0); + const struct block *block = get_selected_block (); struct block_symbol sym = lookup_symbol (name.c_str (), block, SEARCH_FUNCTION_DOMAIN, nullptr); diff --git a/gdb/symtab.c b/gdb/symtab.c index 4ca6f92ff9a..5d5076f2e77 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5979,7 +5979,7 @@ default_collect_symbol_completion_matches_break_on this places which match our text string. Only complete on types visible from current context. */ - b = get_selected_block (0); + b = get_selected_block (); surrounding_static_block = b == nullptr ? nullptr : b->static_block (); surrounding_global_block = b == nullptr ? nullptr : b->global_block (); if (surrounding_static_block != NULL) diff --git a/gdb/valops.c b/gdb/valops.c index ab6fd5079e1..76be9c58e6a 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -3813,7 +3813,7 @@ value_maybe_namespace_elt (const struct type *curtype, struct value *result; sym = cp_lookup_symbol_namespace (namespace_name, name, - get_selected_block (0), SEARCH_VFT); + get_selected_block (), SEARCH_VFT); if (sym.symbol == NULL) return NULL; base-commit: d36b7ef85a30cda5ea19110920f61727be2fd984 -- 2.51.0