From patchwork Sat Jan 11 18:53:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104585 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4ECC53858C48 for ; Sat, 11 Jan 2025 18:55:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4ECC53858C48 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=Uu68ejA6 X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta36.uswest2.a.cloudfilter.net (omta36.uswest2.a.cloudfilter.net [35.89.44.35]) by sourceware.org (Postfix) with ESMTPS id DB3C73858406 for ; Sat, 11 Jan 2025 18:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB3C73858406 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB3C73858406 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736621627; cv=none; b=GomdIrjHpE5cvA9ErPjSkk1s51UWpD5tRKybXW3JidVsCTILnTBE4DGgqP43MDbJq9/U1Q1YyXie2vrd9vYVYtLrjqeu/XPvzVJ5ijViusUG4Tbp2Wj03eTQPzwx9Ay+iUkkcKCoS0KzCowP08yXnxgADg3EcCiYinvKTO9WEHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736621627; c=relaxed/simple; bh=7KdMOKEs4zFsFkpqIarV+RTEKFovE22XP8bGcQ8OMGs=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=LVhHGHeyvtiFk8HneKmYU8qsFY6R7iVY1dvMeSUMTGQdixyZPv2TiCShikN7BQ4rblTCzWtj32kks7mQhTXMuVHs29VOGfJ64TxYoZK2LivhpIlKCLZfrsEXp1GaEL1Ng9c4o1a26efDNHxKno8CnEuGk7jRz/rTb5ILVvIbkT4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB3C73858406 Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTPS id WblBtkTm0YpSZWgcDtWtJf; Sat, 11 Jan 2025 18:53:46 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id WgcCt8NXUXymlWgcDtEwM8; Sat, 11 Jan 2025 18:53:45 +0000 X-Authority-Analysis: v=2.4 cv=Z+/qHmRA c=1 sm=1 tr=0 ts=6782be39 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=VdSt8ZQiCzkA:10 a=ItBw4LHWJt0A:10 a=lfL7OlDyaBibbcYYQr4A:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=8UO4cVsubmGDi1qG1IzP5TBMl3K3WTT8CBOUwCr/ark=; b=Uu68ejA6zhn/468eVWPzFaseeC s/n0r3XjFpTSCrzfkdYHRZQPBepMtMNW9vUxgVzQypL7tSi2Z0Uljblvo3iNDZ/h+faZ2qiy+9fNb VLvTpX8UqvLODLgzCqFfH8XYq; Received: from 97-118-36-154.hlrn.qwest.net ([97.118.36.154]:60626 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1tWgcC-002EQF-1O; Sat, 11 Jan 2025 11:53:44 -0700 From: Tom Tromey Date: Sat, 11 Jan 2025 11:53:42 -0700 Subject: [PATCH 1/2] Use bool for parameter of add_sal_to_sals MIME-Version: 1.0 Message-Id: <20250111-linespec-more-bool-v1-1-fd2213135450@tromey.com> References: <20250111-linespec-more-bool-v1-0-fd2213135450@tromey.com> In-Reply-To: <20250111-linespec-more-bool-v1-0-fd2213135450@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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.118.36.154 X-Source-L: No X-Exim-ID: 1tWgcC-002EQF-1O X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-36-154.hlrn.qwest.net (prentzel.local) [97.118.36.154]:60626 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEP5NOyWFvW/0YJBjEZifVKOl9Jtld0+cIUYq0Ayvlz1JKhQBybqVABkPk6xOOPx1Wm/TML1Ytyz44mMUy1W0bp+BUXkKEDxeNn3QRZARsTGhNu7mS0K YiwPKswLifzHNkh6vTnsm3D3eE3sYxgY5Eb4euQT0apqtD6Cm1D3wWTxDAGE275dpWViIy5vs68U7u0dftRc/5bCIlsfqlXKu0s= X-Spam-Status: No, score=-3019.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.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~patchwork=sourceware.org@sourceware.org This changes add_sal_to_sals to use 'bool' rather than 'int'. --- gdb/linespec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index b58b4ce029a02d912e8fb8d3d76c179efb6da599..b3b7b418ec427a1e31495ede706e518b1c344340 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1065,14 +1065,14 @@ linespec_lexer_peek_token (linespec_parser *parser) the new sal, if needed. If not NULL, SYMNAME is the name of the symbol to use when constructing the new canonical name. - If LITERAL_CANONICAL is non-zero, SYMNAME will be used as the + If LITERAL_CANONICAL is true, SYMNAME will be used as the canonical name for the SAL. */ static void add_sal_to_sals (struct linespec_state *self, std::vector *sals, struct symtab_and_line *sal, - const char *symname, int literal_canonical) + const char *symname, bool literal_canonical) { sals->push_back (*sal); @@ -2134,7 +2134,7 @@ create_sals_line_offset (struct linespec_state *self, sal.symbol = sym; add_sal_to_sals (self, &values, &sal, - sym ? sym->natural_name () : NULL, 0); + sym ? sym->natural_name () : nullptr, false); } } @@ -2166,7 +2166,7 @@ convert_address_location_to_sals (struct linespec_state *self, sal.symbol = find_pc_sect_containing_function (sal.pc, sal.section); std::vector sals; - add_sal_to_sals (self, &sals, &sal, core_addr_to_string (address), 1); + add_sal_to_sals (self, &sals, &sal, core_addr_to_string (address), true); return sals; } @@ -2191,7 +2191,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) && state->maybe_add_address (pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, - sym.symbol->natural_name (), 0); + sym.symbol->natural_name (), false); } } else if (!ls->function_symbols.empty () || !ls->minimal_symbols.empty ()) @@ -2256,7 +2256,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) && state->maybe_add_address (pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, - sym.symbol->natural_name (), 0); + sym.symbol->natural_name (), false); } } } @@ -3945,7 +3945,7 @@ decode_digits_list_mode (struct linespec_state *self, val.pc = 0; val.explicit_line = true; - add_sal_to_sals (self, &values, &val, NULL, 0); + add_sal_to_sals (self, &values, &val, NULL, false); } return values; @@ -4096,7 +4096,7 @@ minsym_found (struct linespec_state *self, struct objfile *objfile, sal.section = msymbol->obj_section (objfile); if (self->maybe_add_address (objfile->pspace (), sal.pc)) - add_sal_to_sals (self, result, &sal, msymbol->natural_name (), 0); + add_sal_to_sals (self, result, &sal, msymbol->natural_name (), false); } /* Helper for search_minsyms_for_name that adds the symbol to the From patchwork Sat Jan 11 18:53:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104586 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0EF1B385840A for ; Sat, 11 Jan 2025 18:56:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0EF1B385840A Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=SeyjLibe X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id 184283858D3C for ; Sat, 11 Jan 2025 18:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 184283858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 184283858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736621626; cv=none; b=QeHpgvfM/KlFyuR5ak8ZUGwqIJpjCe0u4Js859tWLHEDa0Da6vkrYliX+z2k/Yc7qbVHK2/qs2vFG2LmOHKS9iEXy+85NIPJRe78ifRz8f/yxUlmgdkpgU7uC1j2oRGpA/gJ9kmzUtLCVTgHxV4DuIFNwG8C1zIe6Kic84aGojs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736621626; c=relaxed/simple; bh=GtnmS44a1A33Jm2wXE5dJ1SgqVEUyhQVQz0qhxbWZlU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=KaD6qSRQhSaYAeozhuL3owVaqvSInYruG9l8fBv5Esacd8k9YcN9hITfibFkwlQnFwMRsIqDhpQpO+xOJaj3UXAPd/PT1DmHKIx0ItE/4QyS2qA7ysUN5uGDEjVe4GhIjm9g7cVYjDfyem5CV4KDY9mMYMQiRy6UitPoDNzMosU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 184283858D3C Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTPS id WTbQtdSCbxoE1WgcDtJ0O3; Sat, 11 Jan 2025 18:53:45 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id WgcCtmQlm9EdGWgcDtAls8; Sat, 11 Jan 2025 18:53:45 +0000 X-Authority-Analysis: v=2.4 cv=WsrgMsfv c=1 sm=1 tr=0 ts=6782be39 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=VdSt8ZQiCzkA:10 a=ItBw4LHWJt0A:10 a=RVQZXhPNKWkRva1Pn9AA:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=2li7Nd3AHt6lv1V3fA/AgfUHoRH3QBQKdtqwQFPNYkM=; b=SeyjLibe7Z2kIb5/O/m5gZ6Neh 9uoDexNy6Vui2H6pHd0lLGAWxdwrXytpY4d7cdOeImpMOmXwXuGImNCygmNaeiYULET9YVuK9yrea QglgmjRS8BK27eBwKZ9bFXlpe; Received: from 97-118-36-154.hlrn.qwest.net ([97.118.36.154]:60626 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1tWgcC-002EQF-20; Sat, 11 Jan 2025 11:53:44 -0700 From: Tom Tromey Date: Sat, 11 Jan 2025 11:53:43 -0700 Subject: [PATCH 2/2] Use bool in decode_line_2_item MIME-Version: 1.0 Message-Id: <20250111-linespec-more-bool-v1-2-fd2213135450@tromey.com> References: <20250111-linespec-more-bool-v1-0-fd2213135450@tromey.com> In-Reply-To: <20250111-linespec-more-bool-v1-0-fd2213135450@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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.118.36.154 X-Source-L: No X-Exim-ID: 1tWgcC-002EQF-20 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-36-154.hlrn.qwest.net (prentzel.local) [97.118.36.154]:60626 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDGf89DxHADPGxftO3g4OGWkv+0m8EKd6IF7KMKz856RSrtwT3SXaLjHXFRzwfk5UbNcXs+g4FbLqHtX7yEbAQE2NMCV4nqmnRrSD3DA4NDtoCsa2Pti t5yVhsD1LapBwq0d/xhgx6V6WF1p/m/b7+ba5hMRfqni6ixnXYF+1Foz/4EFDvVbJIUjI04p2QJOkm7RIXd1XZTXsS5QpeZssZU= X-Spam-Status: No, score=-3019.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.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~patchwork=sourceware.org@sourceware.org This changes decode_line_2_item::selected to bool. There was no benefit to keeping this as a bitfield, so I removed that. Note that the constructor already uses bool here. --- gdb/linespec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index b3b7b418ec427a1e31495ede706e518b1c344340..9b820d860d820972cfd49774382985e547834fd9 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1378,9 +1378,8 @@ struct decode_line_2_item /* The form using symtab_to_filename_for_display. */ std::string displayform; - /* Field is initialized to zero and it is set to one if the user - requested breakpoint for this entry. */ - unsigned int selected : 1; + /* True if the user requested breakpoint for this entry. */ + bool selected; }; /* Handle multiple results in RESULT depending on SELECT_MODE. This @@ -1495,7 +1494,7 @@ decode_line_2 (struct linespec_state *self, if (!item->selected) { filters.push_back (item->fullform.c_str ()); - item->selected = 1; + item->selected = true; } else {