From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id l/aKKdW2eGp6jRgAWB0awg (envelope-from ) for ; Sun, 09 Aug 2026 13:20:21 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=kFlqvuCz; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 966371E09B; Sun, 09 Aug 2026 13:20:21 -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,FREEMAIL_FROM,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 BB5641E09B for ; Sun, 09 Aug 2026 13:20:20 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D9ED4BA7982 for ; Sun, 9 Aug 2026 17:20:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D9ED4BA7982 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=kFlqvuCz Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 42EDF4BA23F3 for ; Sun, 9 Aug 2026 17:19:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42EDF4BA23F3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 42EDF4BA23F3 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::329 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786295996; cv=none; b=CdvBGtsc3STeZ7pwFKT+2Y2lF5Q5HCoDQSjW6Rvev6662z+jNQ+vdHieiZBBih9wqim1tzAcsDdFcxYxmAmjHmzfAv1w/hkTMz0RCArQ/wBIkMlCxx/fFrpunLfTZCrBA5c4tME466D4lEfh/NbOPgR2zVjq5FHmH+bHw95ZGUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786295996; c=relaxed/simple; bh=GMqyzZTPKOoVcS0o+s+jOyFKApoR4GtwhDr1QquXpjU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BVwNcr0+XZFCQ/c2FmeCcBrcyQEolje1FSTcWhsErwM6MzZG8cJwDW//11oVDRNixPn57Y7dbH+cs/M/rJGZwdJUKMt3zgGsfBw8J0KpbNJgz6WJ1MoNedpg9YZb+3IwtR4j4QXV2ojUjfPFn+wrMd7ge/dZLct8P3JmvPMaXlQ= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=kFlqvuCz DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42EDF4BA23F3 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-498028b3d5eso12761225e9.1 for ; Sun, 09 Aug 2026 10:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786295995; x=1786900795; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=m7AHdc5B/8k38XiFFWKiRL9HPOt14zckIiKn662TMEU=; b=kFlqvuCz8iSYo0rpT1/9zl5jtrhLLm+UYwxYwSh/mFXNhDjfEXLw/ol8KLCVrgQWFA sneHKzmHAbAj2tPzN5XDGthgEB0+7cyrct7d1raKDgPZ2uk6t6kBOet1UJ71yClsl1VM nzXoyena9ymY5pkKNHcMQc3RHBOPaU61zGbq81IRCm3SUU/XTASHX0rmR8lj9Ou6MPMs Qbgy/wx/qmjmq7l209yw7l/B7yjOYRPwBbJ8OFt40bRPxn6aBvcSjmKW/LOpKWcDwu7b /77o4IIx52jugMDUju3iTIOGsjXaq3uUE1uIVPLfItV2O+gmMeV7d5+VTzIZhR5rSSYM Hyew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786295995; x=1786900795; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=m7AHdc5B/8k38XiFFWKiRL9HPOt14zckIiKn662TMEU=; b=cPWcYCz7Fcxlf6L3GHQ+IDW3pUvVKQwz9klAWYl6ALG3INtMo3u3Zd9DAd/xMqGYpI FrsbJXX4lnpvB3Swf5Pgw7550UqUHyGGSxW4toS2Lgk4UXTA5/dGOa4MzPpK+T2nR5/6 1Q6x/xS5OVQZH6g6cFgguU01ud5RCXuQXZV+HHghE7wFrmXp994U5doPyeTjr24v2vmm 5pdHInjVY+amM0qfignPgc87aag0fJ37OvRYZ4OLOXgdzwD4RKGi+6W/lqvihsdPWUs1 t4/UG2/7wP1hk81WpxqPO6lGcrMWwuY1pe63nwrh1t/FgKXl7hwxGc0hyAkSZnAmeYSx 3N/A== X-Gm-Message-State: AOJu0YywlZ+Tt5RDnadwP74N1y1EwplXwRa3Epl5r0IYIThtsZnm7+EV Krnw1dk56BZaIlGYxyV4bj1LLPFBMGhuFp/caKVlLJ2LSwO1QCMEhKK65Cymtg== X-Gm-Gg: AR+sD12zyquoA08eWuTonIcKhglCyG00zsNNOZyhH/43F8OnLSfgGmVsVuTUovWQyJq eW2u5c8+FaS0A0MD2MxzIs1wVkClf4y5MoUEENzvuhZax6wuPmMnDwV4bOrrJggS+gN9VD4ISFK iu4ndX3+IFKz466d393J8NVpZnOZ8/9lcfEZssrYCHj+0R8HYX5b2yS5t5UXZwBGzjYj9bC+nQZ yEftdjW0ddHxSLJpm60YR9M/fci5Y+LbKYguXYb0i60oSxslIsZyFo9bTWfHcE8gdjpSowWaDiO L8iC6dp9CWZfmkvYUV+p4HJ+LNeTAoFLkz0H7Ig8tICcG10+n6h9TEa8ETlKkHx/A9jX6VnvqH/ CGOuRpWCjg9BlUXxJZzbWyBovGzEmZPwkzaTz4MZoSg8YrAcvfbFDAvbf14HOtmiKOblSI9tiai RTQWAjLgt/MorMi9DeMXy0VuV+kBN/n7p1MpGnvXrzyDlwqnjfApr8YsYqGPh4rkSoAAQFjnPvy JimO0+ME8/hKJarK3OGjSYVst4S6k+jTudRJWDZCUiI06gsetT0lRPkuqo= X-Received: by 2002:a05:600c:a47:b0:496:c379:b2a1 with SMTP id 5b1f17b1804b1-4994e71296fmr483805625e9.2.1786295994936; Sun, 09 Aug 2026 10:19:54 -0700 (PDT) Received: from Mein-PC (p200300ed8f49750099dd7b2523117a23.dip0.t-ipconnect.de. [2003:ed:8f49:7500:99dd:7b25:2311:7a23]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4995420bd1csm331456805e9.3.2026.08.09.10.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 10:19:54 -0700 (PDT) From: Oleg Tolmatcev To: gdb-patches@sourceware.org Cc: Oleg Tolmatcev Subject: [PATCH v4] gdb: search local symbols before global symbols in completion Date: Sun, 9 Aug 2026 19:19:37 +0200 Message-ID: <20260809171936.645-2-oleg.tolmatcev@gmail.com> X-Mailer: git-send-email 2.55.0.windows.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 When symbol completion is performed from a selected frame, search the local blocks before scanning minimal symbols and global/static symbols. This makes completion prefer names that are visible in the current context, including local variables. Add a regression test that checks completion prefers a local symbol over a global symbol with the same name. --- gdb/symtab.c | 72 +++++++++++++-------------- gdb/testsuite/gdb.base/break.c | 21 ++++++++ gdb/testsuite/gdb.base/completion.exp | 10 ++++ 3 files changed, 67 insertions(+), 36 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 5d5076f2e77..85665bebdf4 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5931,6 +5931,42 @@ default_collect_symbol_completion_matches_break_on lookup_name_info lookup_name (sym_text, name_match_type, true); + /* Search upwards from currently selected frame (so that we can + complete on local vars). Also catch fields of types defined in + this places which match our text string. Only complete on types + visible from current context. */ + + 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) + while (b != surrounding_static_block) + { + QUIT; + + for (struct symbol *sym : block_iterator_range (b)) + { + if (code == TYPE_CODE_UNDEF) + { + completion_list_add_symbol (tracker, sym, lookup_name, + sym_text, word); + completion_list_add_fields (tracker, sym, lookup_name, + sym_text, word); + } + else if (sym->domain () == STRUCT_DOMAIN + && sym->type ()->code () == code) + completion_list_add_symbol (tracker, sym, lookup_name, + sym_text, word); + } + + /* Stop when we encounter an enclosing function. Do not stop for + non-inlined functions - the locals of the enclosing function + are in scope for a nested function. */ + if (b->function () != NULL && b->inlined_p ()) + break; + b = b->superblock (); + } + /* At this point scan through the misc symbol vectors and add each symbol you find to the list. Eventually we want to ignore anything that isn't a text symbol (everything else will be @@ -5974,42 +6010,6 @@ default_collect_symbol_completion_matches_break_on SEARCH_ALL_DOMAINS); } - /* Search upwards from currently selected frame (so that we can - complete on local vars). Also catch fields of types defined in - this places which match our text string. Only complete on types - visible from current context. */ - - 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) - while (b != surrounding_static_block) - { - QUIT; - - for (struct symbol *sym : block_iterator_range (b)) - { - if (code == TYPE_CODE_UNDEF) - { - completion_list_add_symbol (tracker, sym, lookup_name, - sym_text, word); - completion_list_add_fields (tracker, sym, lookup_name, - sym_text, word); - } - else if (sym->domain () == STRUCT_DOMAIN - && sym->type ()->code () == code) - completion_list_add_symbol (tracker, sym, lookup_name, - sym_text, word); - } - - /* Stop when we encounter an enclosing function. Do not stop for - non-inlined functions - the locals of the enclosing function - are in scope for a nested function. */ - if (b->function () != NULL && b->inlined_p ()) - break; - b = b->superblock (); - } - /* Add fields from the file's types; symbols will be added below. */ if (code == TYPE_CODE_UNDEF) diff --git a/gdb/testsuite/gdb.base/break.c b/gdb/testsuite/gdb.base/break.c index 26085d40ca2..c9b74c6a567 100644 --- a/gdb/testsuite/gdb.base/break.c +++ b/gdb/testsuite/gdb.base/break.c @@ -23,6 +23,26 @@ extern int marker2 (int a); extern void marker3 (char *a, char *b); extern void marker4 (long d); +struct completion_global_struct +{ + int global_field; +}; + +struct completion_local_struct +{ + int local_field; +}; + +struct completion_global_struct completion_var; + +static void +completion_local_over_global (void) +{ + struct completion_local_struct completion_var = { 23 }; + + completion_var.local_field++; /* local-completion-breakpoint */ +} + /* We're used by a test that requires malloc, so make sure it is in the executable. */ void *need_malloc () @@ -50,6 +70,7 @@ main (int argc, char **argv, char **envp) marker2 (43); /* set breakpoint 20 here */ marker3 ("stack", "trace"); /* set breakpoint 21 here */ marker4 (177601976L); + completion_local_over_global (); /* We're used by a test that requires malloc, so make sure it is in the executable. */ (void)malloc (1); diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index 44cf649d5b6..4cecd552d3c 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -87,6 +87,16 @@ gdb_test "complete set gnutarget aut" "set gnutarget auto" gdb_test "complete set cp-abi aut" "set cp-abi auto" +# Check that symbol completion in a selected frame prefers a local +# symbol over a global symbol with the same name. +gdb_breakpoint [gdb_get_line_number "local-completion-breakpoint"] +gdb_continue_to_breakpoint "local-completion-breakpoint" +gdb_test "complete p completion_var.l" "p completion_var.local_field" + +# Leave the helper frame before continuing with the readline-based +# completion checks below. +gdb_test "finish" ".*" "return from local completion helper" + # Test that completion of commands 'target FOO' works well. set targets [list "core" "tfile" "exec"] -- 2.55.0.windows.3