From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id U8tfLZsPVWp4ZQYAWB0awg (envelope-from ) for ; Mon, 13 Jul 2026 12:17:31 -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=EbH8xFW8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=EbH8xFW8; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A54291E09B; Mon, 13 Jul 2026 12:17:31 -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 7EF461E033 for ; Mon, 13 Jul 2026 12:17:30 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D16B4BA2E1C for ; Mon, 13 Jul 2026 16:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D16B4BA2E1C 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=EbH8xFW8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=EbH8xFW8; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 1ED4B4BA2E09 for ; Mon, 13 Jul 2026 16:17:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1ED4B4BA2E09 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 1ED4B4BA2E09 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783959423; cv=none; b=dD5CkbYWp8xLQ1r+/ojaYBL0mG93PL5f/87xk+QKRWwqLigZx238hxX7akShDnvdFXUmApyJjOOBJp4LT92+kFsWePiqiol0roi+kCF6CtnsrAnxwqPMwkkqXpJ77pJhV+IduioktFhdLRm3qzqPWsjVqPJdz+WZTsT8falDz+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783959423; c=relaxed/simple; bh=C12Kx+a01k94ndbBcNNK6xCflqlH1TN6h+JcMNBSPK4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=VAwwBL0ctWWy0vUcnKy0VyVrw1YdEUDWiHsGoS4jysdwd1V0qvUqEslatEf92UBAdc/O6uQIQYJTIZjg5up1gIR/ePnVUrX35uEZTIUcg4eqbDaDoL6vdtTj1VbcCTVseBBHSxKaNh43y6nHP9etxJUGutpihd6S9Fq64/EYNGU= 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=EbH8xFW8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=EbH8xFW8; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=JBA7UNGZ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1ED4B4BA2E09 Received: from imap1.dmz-prg2.suse.org (unknown [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 0593C77997 for ; Mon, 13 Jul 2026 16:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1783959422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vfFuEG1kQ1C031Rip3QkpZCKi9+g4IO2LJd7rmIxfqE=; b=EbH8xFW8qKWbDwqsOph+hnKYruIzWBsppvnPkizqoxsL4eudgN1tRwYXPMWBkVxXEUvyPF BrO8hz0xtwzrjk3UUOwc36kOdmId35OwwDyuPd/bcEaYjJmFXwDrSQlS7+TQItJ4Zbt+aq xg5kMLW3kOBCJs0QAeekA2nGA7D8zpY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1783959422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vfFuEG1kQ1C031Rip3QkpZCKi9+g4IO2LJd7rmIxfqE=; b=JBA7UNGZsmjWdBOb4fiQj71AMnEfD6Zduxwa+97HqU9HTnvoM0WqUrTxO48+w1112cGIMX 8PL0hquRjYM6KtCw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1783959422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vfFuEG1kQ1C031Rip3QkpZCKi9+g4IO2LJd7rmIxfqE=; b=EbH8xFW8qKWbDwqsOph+hnKYruIzWBsppvnPkizqoxsL4eudgN1tRwYXPMWBkVxXEUvyPF BrO8hz0xtwzrjk3UUOwc36kOdmId35OwwDyuPd/bcEaYjJmFXwDrSQlS7+TQItJ4Zbt+aq xg5kMLW3kOBCJs0QAeekA2nGA7D8zpY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1783959422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vfFuEG1kQ1C031Rip3QkpZCKi9+g4IO2LJd7rmIxfqE=; b=JBA7UNGZsmjWdBOb4fiQj71AMnEfD6Zduxwa+97HqU9HTnvoM0WqUrTxO48+w1112cGIMX 8PL0hquRjYM6KtCw== 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 E3185779AE for ; Mon, 13 Jul 2026 16:17:01 +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 KF+fNX0PVWrSGwAAD6G6ig (envelope-from ) for ; Mon, 13 Jul 2026 16:17:01 +0000 Message-ID: <00c8dabe-0035-44d1-911c-1cb041bef589@suse.de> Date: Mon, 13 Jul 2026 18:17:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PING][PATCH] [gdb/exp] Limit workaround in using_direct::valid_line to broken GCC versions From: Tom de Vries To: gdb-patches@sourceware.org References: <20260604162135.2846175-1-tdevries@suse.de> <6e2bce3d-96f2-4957-bf5a-bf66219bd7dd@suse.de> Content-Language: en-US In-Reply-To: <6e2bce3d-96f2-4957-bf5a-bf66219bd7dd@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,sourceware.org:url] 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 On 6/18/26 9:53 AM, Tom de Vries wrote: > On 6/4/26 6:21 PM, Tom de Vries wrote: >> 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. >> > > Ping. > I've pushed this. Thanks, - Tom > Thanks, > - Tom > >> 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 > licenses/>.  */ >> + >> +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 >