From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id gB5gHhBbc2pRJwoAWB0awg (envelope-from ) for ; Wed, 05 Aug 2026 11:47:28 -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=AmOHCRzh; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 6CA561E09B; Wed, 05 Aug 2026 11:47:28 -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 [IPv6:2620:52:6:3111::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 AEEB71E09B for ; Wed, 05 Aug 2026 11:47:27 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5D994BB3BA7 for ; Wed, 5 Aug 2026 15:47:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5D994BB3BA7 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=AmOHCRzh Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 418974B9DB65 for ; Wed, 5 Aug 2026 15:46:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 418974B9DB65 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 418974B9DB65 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::331 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785944816; cv=none; b=lqPKBdBkYEXd35HFXCpzmflJeWQpm8EaOWCud45FGxdy0IIKqtEOUOXmQ6Ogxt3GFbuEhPcRTIUx85QNLJ4EUAl5AgiiF39aooiq2NIWYJjJl+rr4BO2W4C/6d9ehFqyCi1VMCYoUvXRI4bAFxI6JFx3CSCEUik7ESGSgUbJaow= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785944816; c=relaxed/simple; bh=lXzP2R2tVd/94/dENDqxPJSrZAoQoyvlfoAxUPnBsRo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ka5f+v7tKjz8P1ZPBx9dVRgyaPHIgVbwnGCUvclvjawI7p614I9dW7EwDn5ENuJMFPAQsLvHGliO7JRKIsA5ZB6Cmk5J6vxa9vQTMZlCOjyvxduiDaKyLx1ma8zkG7j4GW5X/r7Lg0RGSXtMcCvSfVxxqLrBduLwLLHshDWPsjA= 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=AmOHCRzh DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 418974B9DB65 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4954aff6088so12109775e9.3 for ; Wed, 05 Aug 2026 08:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785944815; x=1786549615; 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=Q5JA/nV1M7AbVo/zfHKzMHudLzgJgCs1w9ewFN64Xsw=; b=AmOHCRzhCEHvEnJNGWHBWryq51zLf/HbYr/FgB9JKm8B/K5XnBUiLeCbYRMQJI8ZxO y73FqPfNVBxGQUSrx79z9v3TCImNqJxmf774+cTvMIinEWhyJxm2nkFGaSXw/y7aRFgc 4zdBgMYiEaU2rOLxsn1JOqYg2infZfFa1iAQR5Y2eh8eYkjScwHm9t8PPV9gdmmP5c3g CTDXz22u6cuxkGZ83AN7Sy4wXRLO7TlWaEsMExPDiu5ZDAQ+KUw1FBWCHAs5BrivvQ7a tqtTiLSVDrx+q8ZVKZl1cA8EqpKI9+KQ1eYmt9aOKX6wT24SNbm4/KG6AK2c/pzq6WWl kXFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785944815; x=1786549615; 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=Q5JA/nV1M7AbVo/zfHKzMHudLzgJgCs1w9ewFN64Xsw=; b=ID+14MxNjCSlSmbCUT+HhiL6wOFZQSGq2oTHBg3tGmzcIu3XRacYi1TLzjDmD978Me 5H0gGaQDemz4tTBX7j8w+UZPKea2NBeGBD15oNq9cjQQ5ABhkD3RnywLDEdQ+4eHPGa1 PQJO15Sr4pzV/Ao2wJwHWOwdHFHB7FgAlXRennmACTJ2Enar/kNlj7EaPHEufl2L1X00 YYyEwq4UuEg4HR/8PbKsQ/6E7igbGhoNBgIvyZPx0bnackY6XoNlkZAypiMOQNl6nuGY 1CPFwlEyEsDqD5aPkD3aZ4Wj7nQEKQmSD9SLhnVQWD77LW7DBuDA+PX/erfVXoc12j0v qBUA== X-Gm-Message-State: AOJu0Yx416VETBbOkupj0WFn2bJg2mHkOrhcixa6P6p+dlvckyAHaexk LjGFNFA78M9sMed1eJXjva1E2uJFFjWg/ym4Har5ABIOj7YpAN5h9ypGH1dNtw== X-Gm-Gg: AR+sD12LDJ6RrQNly/HBEZOr7LRRVTqOeOmVkJucpGw771U2cJc1Ci++5Ds9Gs9EsPq +b62X25UAWE1/aVp8I84hkdBSfs4A5l0C1233iN7LD17OpWXWQ/BVcDNvjz5BiMfnzodTa9Mqmb GMswQB1tEXX8giGsHpM4J4GhFpSXqhU1pU86LNxXik8XmTajBke0oANkSy8jlUM9YOjrZIUAFS+ YSFzCXx2zfcTJdK9Nu18XSqFvyheajHdP3ndPNqGHgg8msBz0tqDbnuMjjFt/QBHBi/C8VNXmyT wUvsB3z7G0P25KxZEAkrhc/IQmLPQdiwh8LYOdb8K35xa9BRNhdQmTIUUemUF/DgAtYIzdiQqPN wxLtObe2491/jzKbQ9cFNjOFi+tvXfoPvlA1h2jsEfRcHZOon2Es4wZexfebF9B8XrExjwdRUlH gANf29CHkmOdSj+8B0FjKKFrc0cKSxntZfTmvPID69iNSFijC62G80lGaZm6NiLraIivdVs749D MSE/MeJ7vZc//u39vgwJAdh8KjNAWdX5dTisDyhO285k7P8/HCZ5bKf1hGWplab/GdofQ== X-Received: by 2002:a05:600c:1c25:b0:499:4e47:eaf2 with SMTP id 5b1f17b1804b1-4994e79dbf0mr109041355e9.6.1785944814696; Wed, 05 Aug 2026 08:46:54 -0700 (PDT) Received: from Mein-PC (p200300ed8f13800094889160799bf548.dip0.t-ipconnect.de. [2003:ed:8f13:8000:9488:9160:799b:f548]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4994a0fc94esm202307335e9.12.2026.08.05.08.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 08:46:54 -0700 (PDT) From: Oleg Tolmatcev To: gdb-patches@sourceware.org Cc: Oleg Tolmatcev Subject: [PATCH v3] gdb: search local symbols before global symbols in completion Date: Wed, 5 Aug 2026 17:46:37 +0200 Message-ID: <20260805154636.1663-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 | 7 +++ 3 files changed, 64 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..78a19780443 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -87,6 +87,13 @@ 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" +gdb_test_no_output "select-frame 1" + # Test that completion of commands 'target FOO' works well. set targets [list "core" "tfile" "exec"] -- 2.55.0.windows.3