From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id CAE503858D1E for ; Wed, 9 Nov 2022 17:03:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CAE503858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id A705F1003EF4A for ; Wed, 9 Nov 2022 17:03:39 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id soUFoAv3OIyPJsoUFoLcWJ; Wed, 09 Nov 2022 17:03:39 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Kb0XDSUD c=1 sm=1 tr=0 ts=636bdd6b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=9xFQ1JgjjksA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=CCpqsmhAAAAA:8 a=mEcUcuiQPFiwXncXBYIA:9 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References :Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kJn75FoM8bAQaDSHmO5vD/2MY5R1ALVUr9p3yLMzIUk=; b=uH+oCnZyVqR5MkTEoHRX6NC+6Z jWTDsjs95th4zFkX0GDpbJqipgdSVS4VFxS+DV3emJODWQrNmMxy13dVXZSrU5+BPxDzVG3vNbvKe iNZfwyxwPlJprtZRPDL9pPGa4; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:56804 helo=murgatroyd) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1osoUE-003GOo-To; Wed, 09 Nov 2022 10:03:38 -0700 From: Tom Tromey To: Bruno Larsen via Gdb-patches Cc: Bruno Larsen Subject: Re: [PATCH 1/2] gdb/c++: validate 'using' directives based on the current line References: <20221026155053.3394792-1-blarsen@redhat.com> <20221026155053.3394792-2-blarsen@redhat.com> X-Attribution: Tom Date: Wed, 09 Nov 2022 10:03:36 -0700 In-Reply-To: <20221026155053.3394792-2-blarsen@redhat.com> (Bruno Larsen via Gdb-patches's message of "Wed, 26 Oct 2022 17:50:53 +0200") Message-ID: <87cz9w2h7b.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1osoUE-003GOo-To X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (murgatroyd) [97.122.76.186]:56804 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3022.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: >>>>> "Bruno" == Bruno Larsen via Gdb-patches writes: Bruno> When asking GDB to print a variable from an imported namespace, we only Bruno> want to see variables imported in lines that the inferior has already Bruno> gone through, as is being tested last in gdb.cp/nsusing.exp. However Bruno> with the proposed change to gdb.cp/nsusing.exp, we get the following Bruno> failures: Thanks for the patch. I have a few minor comments. Bruno> + /* If the using directive was below the place we are stopped at, Bruno> + do not use this directive. */ Bruno> + if (!valid_line (current, boundary_sal.line)) Bruno> + continue; 'valid_line' seems like a kind of generic name for this. Maybe it should be a method on 'using_direct'? Bruno> + /* When was the using directive was declared. Bruno> + If this was not supplied, set it to 0 so the directive is always valid. Bruno> + Since the type changes from DWARF 4 to DWARF 5, we must check Bruno> + the type of the attribute. */ Bruno> + struct attribute *decl_line = dwarf2_attr (die, DW_AT_decl_line, cu); Bruno> + unsigned int line; Bruno> + if (decl_line == nullptr) Bruno> + line = 0; Bruno> + else if (decl_line->form_is_constant ()) Bruno> + line = decl_line->constant_value (0); Bruno> + else if (decl_line->form_is_unsigned ()) Bruno> + line = decl_line->as_unsigned (); Bruno> + else Bruno> + gdb_assert_not_reached (); Asserting here seems wrong, because it means gdb will crash in response to invalid DWARF. It's better to emit a complaint and fall back to some default, or ignore the directive. Bruno> std::vector excludes; Bruno> + struct attribute *decl_line = dwarf2_attr (die, DW_AT_decl_line, cu); Bruno> + unsigned int line; Bruno> + if (decl_line == nullptr) Bruno> + line = 0; Bruno> + else if (decl_line->form_is_constant ()) Bruno> + line = decl_line->constant_value (0); Bruno> + else if (decl_line->form_is_unsigned ()) Bruno> + line = decl_line->as_unsigned (); Bruno> + else Bruno> + gdb_assert_not_reached (); Here too. If there's a lot of duplicated code maybe it should be factored into a new function (I didn't look). Bruno> +bool Bruno> +valid_line (struct using_direct *using_dir, Seems like this could be const; and if it's a method it could be const-qualified. Bruno> + return using_dir->decl_line <= curr_sal.line Bruno> + || using_dir->decl_line >= boundary; GNU style would parenthesize this. Bruno> struct using_direct *next; Bruno> + unsigned int decl_line; Should have a comment. Tom