From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WlP2EDOmIWq1ezQAWB0awg (envelope-from ) for ; Thu, 04 Jun 2026 12:22:11 -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=aIHd61WS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=aIHd61WS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2A3B01E0A6; Thu, 04 Jun 2026 12:22:11 -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 [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 CDEFF1E062 for ; Thu, 04 Jun 2026 12:22:09 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F186F4BA23EC for ; Thu, 4 Jun 2026 16:22:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F186F4BA23EC 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=aIHd61WS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=aIHd61WS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa 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 9B69B4BA2E09 for ; Thu, 4 Jun 2026 16:21:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B69B4BA2E09 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 9B69B4BA2E09 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=1780590097; cv=none; b=QtPkP44eBaxxf7spAP+cWBIodTyYibUV5a0m4/KadafdIy7gA8eW7GjbikjQOmWEc3pvdQ/MYt7nzUZgRc2w18eRtNZbDaU9B0Rgt04h89kekhPiz7Z7awz7EVoekKFObgXLH9KOGYDyXM5Mde74Ky44eJOvjHpp0LtTf8gjqQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780590097; c=relaxed/simple; bh=aKKds2k7jpMq/J27zIxwfaYRNBFOl7ZbXQKYwDXbxZI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Lz7tICP4hwslZM2LhQnfWnX5CWtvUwFa7ccb9KnzlH6FbqUCQ0rcgp3fkAhNORBfnbBHXWXOX5SFfQtaID4qA4gHuxrUdwDwfHNQ08S73sRnxcHqdRBAm60LGjsPoazJRVgqD9bFLIvhbfymQE/9f/D4BWPl+gMzeixA18+izTo= 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=aIHd61WS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=aIHd61WS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jsTEmXBa DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B69B4BA2E09 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 827A46B24A for ; Thu, 4 Jun 2026 16:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780590096; 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=Uz/mJJApURwvj3urH16l+zKr4DGkLIAQBX4Do/D6qqc=; b=aIHd61WSrNXXffxlGFabfR8plkLH5yRf0SQ1XEVoltIy2mqjt8OwWKtSKcH+zUnrMVe1UF 8ZwFxdx0KtlctLqPyPimX7+THK1Jrj+cJChv2DfpJppz0dvZQsNwk25uzSdwrU7e8+5+JL NsLDrn6NRM4BJ31khutaG6BIX7l38kU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780590096; 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=Uz/mJJApURwvj3urH16l+zKr4DGkLIAQBX4Do/D6qqc=; b=jsTEmXBaRQWS7kMq4z3YLCtuVsxu/SFI5SvW/PWgqT13ZuVEpKJFjl4BSuG4/gcv9lTSL9 xz0OJJ7icdO2P3AA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=aIHd61WS; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jsTEmXBa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780590096; 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=Uz/mJJApURwvj3urH16l+zKr4DGkLIAQBX4Do/D6qqc=; b=aIHd61WSrNXXffxlGFabfR8plkLH5yRf0SQ1XEVoltIy2mqjt8OwWKtSKcH+zUnrMVe1UF 8ZwFxdx0KtlctLqPyPimX7+THK1Jrj+cJChv2DfpJppz0dvZQsNwk25uzSdwrU7e8+5+JL NsLDrn6NRM4BJ31khutaG6BIX7l38kU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780590096; 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=Uz/mJJApURwvj3urH16l+zKr4DGkLIAQBX4Do/D6qqc=; b=jsTEmXBaRQWS7kMq4z3YLCtuVsxu/SFI5SvW/PWgqT13ZuVEpKJFjl4BSuG4/gcv9lTSL9 xz0OJJ7icdO2P3AA== 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 6D3EE779A8 for ; Thu, 4 Jun 2026 16:21:36 +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 iIkxGRCmIWq7WwAAD6G6ig (envelope-from ) for ; Thu, 04 Jun 2026 16:21:36 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/exp] Limit workaround in using_direct::valid_line to broken GCC versions Date: Thu, 4 Jun 2026 18:21:35 +0200 Message-ID: <20260604162135.2846175-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-Rspamd-Queue-Id: 827A46B24A 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[gnu.org:url,suse.de:mid,suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org 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: ... 1 namespace mod_a { 2 int xxx = 10; 3 } 4 5 static void 6 foo () 7 { 8 } 9 10 int 11 main () 12 { 13 { 14 foo (); 15 using namespace mod_a; 16 } 17 18 return mod_a::xxx; 19 } ... compiled with "g++ test.c -g". Attempting to print xxx at line 14 shouldn't find anything (because it's before the "using namespace mod_a"), but it does: ... $ gdb -q -batch a.out -ex start -ex "p xxx" ... Temporary breakpoint 1, main () at test.c:14 14 foo (); $1 = 10 ... This happens because using_direct::valid_line returns true here: ... return (decl_line <= curr_sal.line) || (decl_line >= boundary); ... Since we have decl_line == 15 and curr_sal.line == 14, "(decl_line <= curr_sal.line)" evaluates to false. But boundary == 14, so "(decl_line >= boundary)" evaluates to true. The "(decl_line >= boundary)" bit was added as a workaround for GCC PR debug/108716. Since I'm using GCC 15, the workaround is not needed. Fix this by limiting the workaround to broken GCC versions. Tested on x86_64-linux, using GCC 15.2, and 7.5. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34203 --- gdb/cp-namespace.c | 26 +++++++++++--- gdb/namespace.c | 9 +++-- gdb/testsuite/gdb.cp/ns-before-using.c | 37 ++++++++++++++++++++ gdb/testsuite/gdb.cp/ns-before-using.exp | 44 ++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 gdb/testsuite/gdb.cp/ns-before-using.c create mode 100644 gdb/testsuite/gdb.cp/ns-before-using.exp diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index c8cd5c245aa..16fd4e2ded8 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -33,6 +33,7 @@ #include "namespace.h" #include "inferior.h" #include "gdbsupport/unordered_map.h" +#include "producer.h" #include #include @@ -410,9 +411,26 @@ cp_lookup_symbol_via_imports (const char *scope, found_symbols[sym.symbol->m_name] = sym; } - /* Due to a GCC bug, we need to know the boundaries of the current block - to know if a certain using directive is valid. */ - symtab_and_line boundary_sal = find_sal_for_pc (block->end () - 1, 0); + unsigned boundary_line = 0; + { + struct symbol *fn = block->containing_function (); + int major, minor; + if (fn != nullptr + && producer_is_gcc (fn->symtab ()->compunit ()->producer (), + &major, &minor) + && (major <= 9 + || (major == 10 && minor < 5) + || (major == 11 && minor < 4) + || (major == 12 && minor < 3) + || (major == 13 && minor < 1))) + { + /* Due to a GCC bug (PR debug/108716, fixed in 10.5, 11.4, 12.3, 13.1), + we need to know the boundaries of the current block to know if a + certain using directive is valid. */ + symtab_and_line boundary_sal = find_sal_for_pc (block->end () - 1, 0); + boundary_line = boundary_sal.line; + } + } /* Go through the using directives. If any of them add new names to the namespace we're searching in, see if we can find a match by @@ -423,7 +441,7 @@ cp_lookup_symbol_via_imports (const char *scope, /* If the using directive was below the place we are stopped at, do not use this directive. */ - if (!current->valid_line (boundary_sal.line)) + if (!current->valid_line (boundary_line)) continue; len = strlen (current->import_dest); directive_match = (search_parents diff --git a/gdb/namespace.c b/gdb/namespace.c index 5b5749369ee..d81365a284a 100644 --- a/gdb/namespace.c +++ b/gdb/namespace.c @@ -113,8 +113,13 @@ using_direct::valid_line (unsigned int boundary) const { CORE_ADDR curr_pc = get_frame_pc (get_selected_frame (nullptr)); symtab_and_line curr_sal = find_sal_for_pc (curr_pc, 0); - return (decl_line <= curr_sal.line) - || (decl_line >= boundary); + + /* Apply GCC PR debug/108716 workaround. */ + if (boundary != 0 + && decl_line >= boundary) + return true; + + return decl_line <= curr_sal.line; } catch (const gdb_exception &ex) { diff --git a/gdb/testsuite/gdb.cp/ns-before-using.c b/gdb/testsuite/gdb.cp/ns-before-using.c new file mode 100644 index 00000000000..f74c35b0d3f --- /dev/null +++ b/gdb/testsuite/gdb.cp/ns-before-using.c @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2026 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +namespace mod_a +{ + int xxx = 10; +} + +static void +foo () +{ +} + +int +main () +{ + { + foo (); + using namespace mod_a; + } + + return mod_a::xxx; +} diff --git a/gdb/testsuite/gdb.cp/ns-before-using.exp b/gdb/testsuite/gdb.cp/ns-before-using.exp new file mode 100644 index 00000000000..f891cf56c49 --- /dev/null +++ b/gdb/testsuite/gdb.cp/ns-before-using.exp @@ -0,0 +1,44 @@ +# Copyright 2026 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +standard_testfile .c + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug c++}]} { + return +} + +if {![runto_main]} { + continue +} + +# Xfail for incorrect decl_line on DW_TAG_imported_module, +# GCC PR debug/108716. +set have_gcc108716_xfail \ + [expr {[test_compiler_info gcc-*] && [gcc_major_version] < 13}] + +# Regression test for PR exp/34203. +set re_pass [string_to_regexp {No symbol "xxx" in current context.}] +gdb_test_multiple "print xxx" "" { + -re -wrap $re_pass { + pass $gdb_test_name + } + -re -wrap "$valnum_re = 10" { + if {$have_gcc108716_xfail} { + setup_xfail *-*-* gcc/108716 + } + fail $gdb_test_name + } +} base-commit: bd64797371d27c766d551d0bf115d9090f1d0594 -- 2.51.0