From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OfgkEbIYbmph8jsAWB0awg (envelope-from ) for ; Sat, 01 Aug 2026 12:02:58 -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=JGKqtgA5; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 32CF91E099; Sat, 01 Aug 2026 12:02:58 -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 86D761E099 for ; Sat, 01 Aug 2026 12:02:57 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A30D14BA902E for ; Sat, 1 Aug 2026 16:02:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A30D14BA902E 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=JGKqtgA5 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 2B6D84BA79BB for ; Sat, 1 Aug 2026 16:02:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2B6D84BA79BB 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 2B6D84BA79BB Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::433 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785600146; cv=none; b=LtF09tOVRmZ9MpByPGCx9cwY1ku+KmQ742BkaUyKMNHqMt40VNK1Ub6fxYp+bGpupFYbgRIi58iFWrsZwlicrA8AANQUxtQXA/l9vRvTMRwgq0FL9k26P/DF3qAU2Nd8TOYhidN9HDuKUWkJIcKEIWZgyQW29GwPU1SyMGqZP3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785600146; c=relaxed/simple; bh=ABGyDsMW65HMtloZE+hXX/M7CUxOv0CkLIsWv9GeF/Y=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ndUx6VCHs6tVHTRNjX3+u5WgXDzc3MzhHg0yGtZ4Hl8yBDMUJWmOqPWUo6T8LeLd0DHmLqe863DXPSTVdMakiVPfhp5co2dXHUHWpeusftWX9N5VZdXF4aZanF1aCqshZQSeaLcqe2YNyGBpuCELmNBL6lPKi9++XyMnzZPgI0s= 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=JGKqtgA5 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B6D84BA79BB Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-472326ca506so1488318f8f.2 for ; Sat, 01 Aug 2026 09:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785600145; x=1786204945; 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=De5LvQnLnKccTIgdOiAOb+El0liCfUaEy7AOfppNxYA=; b=JGKqtgA5RIk48ufFuM2Evs7hr5kYxSWQVgZLtbi7UC2e6gseBXQi9TEP4DxFLXSjmv vXa2JCcHYzLoT0YZCF8srTKwTH7jvfSnGp2/CRiQ0bw5t09OJKAvc3hEeZcQDAFojxMt 0TTn+F9K4lZmxbTqarhfcLtLchalocGkKOBjQ1EDFHWNrhDmUVkNVWFO8KnmSVhO3Kdr to4dTXnVObz0guCwY0cRcb/p3kWmxwFl44MlJ+2xBtYFdNsESHxemA4CZtGAkPOJuWRk uGJVoNP2yQgCL4oNi1upAppi/LkSC1fuv5QG9o0Urx7TDQBJjdOHFgyBHpgDZ018dr7A f3Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785600145; x=1786204945; 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=De5LvQnLnKccTIgdOiAOb+El0liCfUaEy7AOfppNxYA=; b=geUuw9OhsPf7iSu9Q3jHRkOiIvw10+yhcLeaZK/x6MLu65dK1P4qbpoSzp2IkpUMFf nZWyfaQU5FuLlZGQuAW+Yg6pyw1DF9n7YoE1FHXsl6hpWPVfRep36uhuRwfRc/BZTs35 lqpSwdtLwJLnaSw+ukSv7+JYWwepDgCUsOV39FafET0kroLd3BTxLjljj8THeNKV6nwr O0sXPsPSZ+3qb5TdEOOuWTSm/MFOEzlk68Or22eROFjv6ybKJ1Z6HtlEZzQdkljEK9wS SJbBazcIMM8TNR/Eix7ekdlWr/oqC+Wkj7kuKodjUl0/dt7jwe2uRv9aCLaOEmATkmbH b02w== X-Gm-Message-State: AOJu0Yxyi8e4z798Vc+ACqsht4yDFkeuV/4GZ7pkYF/Kk+z3INnbjPGc j33+ha6EQNJM/dMLVSGSEIXpfe7Ru98bb0NFntQ2sisRiiYoUGxA9pRIHlrUNw== X-Gm-Gg: AR+sD12bL8kFDm/Q75+n53SUV4x+0SXrL+dtfTG+rjOMuwFVCu54wEbGTkBGJAKDfEM h/zTcHgAUxcEVGgk9w1eG3yW7lMRAvEb+IUWhVQ6h60mmuS01M78PMndJXWbkNJIiD+X9jpAr0V sOXJy2UGR3Hjt38RRDVzMBCDnQNtGLHDpO0YvAYIJWjxtO09MvYQC7W9461acio+c+vVf8C0a3u gArwdpuiM5vlkOPG2fXgG9Nq1ucyBarHTfi0dYuNC6HgaCHYv81qg4gmOw9C+Cd81YI+bub2ld6 L+IAA3MIeyO5CXF5yEaLugR27P1hrFXONtWkMkrDAT2gHoMKMDYvFzfAP1NAl9k83Jelt0tT1Z3 rNiGqegwL60igRybA8v6KoKMOShtHwaxMuueJH0s6UOHOpcHbpHQX4AYiXqI29zXCom++zZY31A siQM2CWzTRKyMPJv+M19ameQJDxYkM1asAUnmuTkO2u41cCYYwv1lQWWlxsZ0x10tWVehY/Pp17 sghMk86letgZYsqbbof89mWmaf/3dqbXshh8a+VTp3l2lIbgFljLIrsfYk= X-Received: by 2002:a05:6000:4308:b0:47f:9aef:5515 with SMTP id ffacd0b85a97d-47fd72c4c22mr8709328f8f.13.1785600144501; Sat, 01 Aug 2026 09:02:24 -0700 (PDT) Received: from Mein-PC (p200300ed8f25390011cee7fff0232c36.dip0.t-ipconnect.de. [2003:ed:8f25:3900:11ce:e7ff:f023:2c36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd41cf404sm16330694f8f.1.2026.08.01.09.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2026 09:02:24 -0700 (PDT) From: Oleg Tolmatcev To: gdb-patches@sourceware.org Cc: Oleg Tolmatcev Subject: [PATCH] gdb: search local symbols before global symbols in completion Date: Sat, 1 Aug 2026 18:01:46 +0200 Message-ID: <20260801160146.1318-2-oleg.tolmatcev@gmail.com> X-Mailer: git-send-email 2.55.0.windows.1 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. --- gdb/symtab.c | 72 ++++++++++++++++++++++++++-------------------------- 1 file changed, 36 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) -- 2.55.0.windows.1