From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KuZ9Mm7/Amp9YTMAWB0awg (envelope-from ) for ; Tue, 12 May 2026 06:22:38 -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=BFet4zwX; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zaTancCs; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=yfQdpUOV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DJvRHBnF; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id AD0661E0C3; Tue, 12 May 2026 06:22:38 -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 582EF1E093 for ; Tue, 12 May 2026 06:22:37 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 081A14BAE7DF for ; Tue, 12 May 2026 10:22:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 081A14BAE7DF 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=BFet4zwX; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zaTancCs; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=yfQdpUOV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DJvRHBnF Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 282484BA2E12 for ; Tue, 12 May 2026 10:21:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 282484BA2E12 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 282484BA2E12 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778581291; cv=none; b=uppT5t8v3jTuTbcP4bj1pz1yq9Yt/aCN01uJUfDKBHX6DpJr/kBDnJUcocGbFoQUYKKqwvDm1pd66xGYd6PHX2LmRX0dj4RJe3DR0xRS4h48u634dmjghjPvAp94cb+bIISDX6FSxMfAX+Umn/zArQUYfJK90BIQaUY1GptPOSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778581291; c=relaxed/simple; bh=CbFMtqveRduPZdf2Ti6sx0qCjMYB5CrM6LxqXpIqPWE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=ARkhVtsBRmhfmTMaBXIv7m8UTuJNQzg4GLCh0SpPmp5nvaeqL9ctPYVhbTVaG24TSdkkiXIFs6zCHJbiVG9gxU/bO+hI+stq3QkbZFPIC+GPHZkcFu8Rtq4c+MZEO7ynFwxm1j/SkV4Rl4ZRwIE7agKypmc3iNvs9qsubK5hFG4= 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=BFet4zwX; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zaTancCs; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=yfQdpUOV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DJvRHBnF DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 282484BA2E12 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-out2.suse.de (Postfix) with ESMTPS id CC26975B42 for ; Tue, 12 May 2026 10:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778581289; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gch5TezK2Ybib/ZH8D98tSQXE1uKzAHpwB4BZswApqI=; b=BFet4zwXLVg1dakhgHqARIgi4+NKku61sdA7IEJzhAJdsJipt0lYNeWKHd80/Hc5W4Gi0U onazb6Yao9zS8n3HKDnwOSpFw2329+yc2JrtQ1DBst+tTS9IJIElAGeG9MPbK/FOTgQpFZ ilQxqV/+TOa0BvRBohzO1KUiqQ1KS3s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778581289; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gch5TezK2Ybib/ZH8D98tSQXE1uKzAHpwB4BZswApqI=; b=zaTancCspDkGrWNf6f/qIzk4POsYRzImk4UegCu64RXvHhMPEiujBaW4MyaoA6n0QpB1Id Sr0SY2b6+stiA1AA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=yfQdpUOV; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=DJvRHBnF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778581285; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gch5TezK2Ybib/ZH8D98tSQXE1uKzAHpwB4BZswApqI=; b=yfQdpUOVqpHbbjoMOhFMCsXiH4b2cY3ea9VzQTB2HG4S86Zx7tbvzAp0287Ers6VrjcHTy i/B6xCOXORaODpXE0kRuLixQC6tI1pFmYn3GaKTj70jOrX44owLFRpabTxzSRmSPM+Cu7i PFcRJSbE6cBy7XjIdCCTmguoePXblk4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778581285; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gch5TezK2Ybib/ZH8D98tSQXE1uKzAHpwB4BZswApqI=; b=DJvRHBnF1iTztefPGhwliFAKAw2dFLajeuGNmkSiN0PuZGE8eAY02CJLHccC7XxpYQgrAl AFr9jFu5UoWRjCBA== 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 B14AB593AC for ; Tue, 12 May 2026 10:21:25 +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 IPv2KSX/AmpjawAAD6G6ig (envelope-from ) for ; Tue, 12 May 2026 10:21:25 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v6 3/3] [gdb/exp] Handle recursive namespace import Date: Tue, 12 May 2026 12:21:24 +0200 Message-ID: <20260512102124.517642-4-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260512102124.517642-1-tdevries@suse.de> References: <20260512102124.517642-1-tdevries@suse.de> 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%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,sourceware.org:url,suse.de:mid,suse.de:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: CC26975B42 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 Consider test.c, compiled to a.out using "g++ -g test.c": ... 1 namespace mod_a { int xxx = 10; } 2 namespace mod_b { using namespace mod_a; 3 int yyy = 20; } 4 int main (void) { 5 using namespace mod_b; 6 void (xxx + yyy); 7 return 0; 8 } ... When trying to print the value of variable xxx we get: ... $ gdb -q -batch a.out -ex start -ex "print xxx" ... Temporary breakpoint 1, main () at test.c:7 7 return 0; No symbol "xxx" in current context. ... The symbol xxx is defined in namespace mod_a, so it's available as: ... (gdb) p mod_a::xxx $1 = 10 ... and namespace mod_b uses namespace mod_a, so it's available as: ... (gdb) p mod_b::xxx $2 = 10 ... Then main uses namespace mod_b so xxx should also be available in main, but it's not. The problem happens here in cp_lookup_symbol_via_imports: ... Thread 1 "gdb" hit Breakpoint 1, cp_lookup_symbol_via_imports (scope=0x5f43d0 "", name=0xfffffffface0 "xxx", block=0x2fba5a0, domain=..., search_scope_first=0, declaration_only=0, search_parents=1, found_symbols=...) at /home/vries/gdb/src/gdb/cp-namespace.c:505 505 cp_lookup_symbol_via_imports (current->import_src, name, ... We're about to follow the "using namespace mod_b" statement: ... (gdb) p *current $1 = {import_src = 0x2ed2140 "mod_b", import_dest = 0x66e910 "", alias = 0x0, declaration = 0x0, next = 0x0, decl_line = 5, searched = 1, excludes = {0x0}} ... But it does so using the current block, which is the function block for main: ... (gdb) p block->function ().m_name $7 = 0x2f8bc20 "main()" ... and the block containing the "using namespace mod_a" statement is the static block. Fix this by additionally iterating over the static and global blocks instead of only using the current block. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34034 --- gdb/cp-namespace.c | 10 +++++++--- gdb/testsuite/gdb.cp/nsusing-2.exp | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index d7a960127dc..9e37265b27d 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -502,9 +502,13 @@ cp_lookup_symbol_via_imports (const char *scope, /* If this import statement creates no alias, pass current->inner as NAMESPACE to direct the search towards the imported namespace. */ - cp_lookup_symbol_via_imports (current->import_src, name, - block, domain, 1, 0, 0, - found_symbols); + for (const struct block *b = block; b != nullptr; + b = ((b->is_static_block () || b->is_global_block ()) + ? b->superblock () + : b->static_block ())) + cp_lookup_symbol_via_imports (current->import_src, name, + b, domain, 1, 0, 0, + found_symbols); } } diff --git a/gdb/testsuite/gdb.cp/nsusing-2.exp b/gdb/testsuite/gdb.cp/nsusing-2.exp index 65e685d0d32..5a2eac5ce67 100644 --- a/gdb/testsuite/gdb.cp/nsusing-2.exp +++ b/gdb/testsuite/gdb.cp/nsusing-2.exp @@ -66,7 +66,6 @@ foreach_with_prefix n {1 2 3 4} { # Function main is using namespace mod_b, and namespace mod_b is using # namespace mod_a, so mod_a::xxx is available as xxx. Regression test for # PR34034. - setup_kfail exp/34034 *-*-* gdb_test "print xxx" " = 10" # This used to print " $ = 20". Regression test for PR34051. -- 2.51.0