From patchwork Tue Mar 18 02:14:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108264 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 584103858CDB for ; Tue, 18 Mar 2025 02:22:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 584103858CDB 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=AXvIvN7y X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id AC5BF3858C98 for ; Tue, 18 Mar 2025 02:15:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC5BF3858C98 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 AC5BF3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264100; cv=none; b=LPX+zwy6Zqw+XXo1De5VjK/GfZJ2uPeInLENu1VB1rBMoHs8Z+JviYbOKk3fDmuGH9yZCqd9CpM31Em+xQWX2y1uufxjY3AzmXt3DyKRSguujEkbK/PPEI1sVlNucQ46kYdLiTDt7C6hJ4aAzLN2qW4wKvMw3FkdVws8kRKRsAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264100; c=relaxed/simple; bh=GGFd2VJU9Zb0aKcEe233r+wdvW5gFaroBLDOZNULHXU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=tim6unEEjVF03HTHvHQ9yScZep6gnbcomUnFh+LZma06iNByZEU/wipOProHGrDTTndVaCmOOUvQ85LqQaryI/SzPb7ofQ4tAyn1QXsjI4jk/qG9jE7LP/UGoG2LiNVpweJO8hb5HTyWNyqNOAhG+7c2cfEe+0oDPBz0g/8ufZQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC5BF3858C98 Received: from eig-obgw-5002a.ext.cloudfilter.net ([10.0.29.215]) by cmsmtp with ESMTPS id u6Z5tu6dvWuHKuMTrtodZT; Tue, 18 Mar 2025 02:14:59 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTqtyisHJ4PguMTrtRJ7T; Tue, 18 Mar 2025 02:14:59 +0000 X-Authority-Analysis: v=2.4 cv=ZaLWNdVA c=1 sm=1 tr=0 ts=67d8d723 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=dBtqliBbio2MP7xg6GkA: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=4jKuwxUn5t+pTBVIVw8WSu2TuZSN2YdTtX8JMxq8tmI=; b=AXvIvN7ye6k/xredizwGIHVOzs dpaDYJ0jIIRZjuVeEPDsYYZ48nRv+H+7CtMBbDG4Idi0KhEDBL02sIvZ2NGEAlgMMkK04ImgwKAfg L377c68FuQbkMzGrzLrFB7q9P; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTq-00000002cIx-0Lp6; Mon, 17 Mar 2025 20:14:58 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:54 -0600 Subject: [PATCH 01/19] Use gdb unordered set and map in corelow.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-1-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTq-00000002cIx-0Lp6 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 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: MS4xfJlec+Lc39yXnhxDcQXHVaeXHPFGSwQCTh0ZU5VIwaao0hJWLYKiBCs68RWfEOKztWYZSyrleEyrNOFK0jdheMPzdUeUoQsTkbn1UXldMNjmGZYnR58B JcVqlSg9dSPPCF8bRPQpai5MBLk12A1yoOvCb+dL3qeoIEvaV8XQK5B20n5bWaehi0aftNPZezsQ6K25ia1Dt652TAjVA4qYKfQ= X-Spam-Status: No, score=-3017.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 corelow.c to use gdb:unordered_set and gdb::unordered_map. --- gdb/corelow.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/corelow.c b/gdb/corelow.c index 59c1667710986fbffdb627e494e9ee3bc852febb..4662b5c6fc749e2688faeda72f9eb1032b600577 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -48,8 +48,8 @@ #include "gdbsupport/pathstuff.h" #include "gdbsupport/scoped_fd.h" #include "gdbsupport/x86-xstate.h" -#include -#include +#include "gdbsupport/unordered_map.h" +#include "gdbsupport/unordered_set.h" #include "cli/cli-cmds.h" #include "xml-tdesc.h" #include "memtag.h" @@ -125,11 +125,11 @@ struct mapped_file_info /* A type that maps a string to a build-id. */ using string_to_build_id_map - = std::unordered_map; + = gdb::unordered_map; /* A type that maps a build-id to a string. */ using build_id_to_string_map - = std::unordered_map; + = gdb::unordered_map; /* When loading a core file, the build-ids are extracted based on the file backed mappings. This map associates the name of a file that was @@ -405,11 +405,11 @@ core_target::build_file_mappings () std::vector regions; }; - std::unordered_map bfd_map; - std::unordered_set unavailable_paths; + gdb::unordered_map bfd_map; + gdb::unordered_set unavailable_paths; /* All files mapped into the core file. The key is the filename. */ - std::unordered_map mapped_files; + gdb::unordered_map mapped_files; /* See linux_read_core_file_mappings() in linux-tdep.c for an example read_core_file_mappings method. */ @@ -774,7 +774,7 @@ rename_vmcore_idle_reg_sections (bfd *abfd, inferior *inf) /* The set of all /NN numbers found. Needed so we can easily find unused numbers in the case that we need to rename some sections. */ - std::unordered_set all_lwpids; + gdb::unordered_set all_lwpids; /* A count of how many sections called .reg/0 we have found. */ unsigned zero_lwpid_count = 0; From patchwork Tue Mar 18 02:14:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108262 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 B3E183858D3C for ; Tue, 18 Mar 2025 02:21:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B3E183858D3C 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=CHXoHoex X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id EC2D63858404 for ; Tue, 18 Mar 2025 02:15:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC2D63858404 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 EC2D63858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; cv=none; b=shG6z+fqs/ngmkhsMB9lhUMQ6qmCsfUaSZPtUpfSY3SnrkAL9TADYBfcXfWQxo7YrUCK52NBKdD9ICO8/YUuHKaPSJeJOHI5SMo8D5Mc/nt1DT6nmhg22WT1kPDTOjMkBmri4gIsfWJ6wYEA8uw5YR0nbQ66br22uO55/0/GQMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; c=relaxed/simple; bh=wxfPnf2apViTHUzyl/cevjx5bPveX9sZlmIJD3W5hW4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=WZqmZdWlx7GEDXlNPA+G/uUAp43DdLg5Yp8eOlDMK2mgq+ncp6xA3uqDW1G6s5A1CUvU82LuGK+fmUId9N7S+XZefwiDVdJ3H05GMroO4o+nyBv+uFJrM1XvF5g79K32r6IdnQtUrabaMOSwdvNIc1os+z9GOSDnlGvbcWXlsLI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC2D63858404 Received: from eig-obgw-5004a.ext.cloudfilter.net ([10.0.29.221]) by cmsmtp with ESMTPS id u7TZtE1Erf1UXuMTst4Akf; Tue, 18 Mar 2025 02:15:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTqtciPcjrgquMTrtZWea; Tue, 18 Mar 2025 02:14:59 +0000 X-Authority-Analysis: v=2.4 cv=PK7E+uqC c=1 sm=1 tr=0 ts=67d8d723 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=8FP1lo1DdbyQ7a3M6qUA: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=wMstBsjBrsE4/FqwdCpP6LE/EFJxxJq36ixXYvoJxB8=; b=CHXoHoex64v8bpudgttIuhVTYr JIBevZHBEOF+gyIc2ikeI6rsvP19rAKEl+YJ4H36waH3ohmzpu+LpBENyjwSUlyKQLlNOaAE5kiTh hyn1tnv9o1we22dypcZpUEzNT; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTq-00000002cIx-1sbH; Mon, 17 Mar 2025 20:14:58 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:55 -0600 Subject: [PATCH 02/19] Use gdb unordered set in breakpoint.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-2-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTq-00000002cIx-1sbH X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 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: MS4xfDkqwSShZWiiai/YVB0B1Rm5foYbMO59nS+UtIxIotb7LR29uheB1amAnqgvaTvc10XhRCP8c/R/M8R5WJiPsG40doWwquewEv5hTD8Eomvv1zCGDG22 uROt5SGN7S+pn/nO1ns0hSEVcye5Ni2JXx61vZ/tisT9senRoCnoDd/bobKrOE8plS9hWSu+0pWxa4bk57UhUo5vTPNcXMIwHio= X-Spam-Status: No, score=-3017.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, 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 breakpoint.c to use gdb:unordered_set. --- gdb/breakpoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 34e32303b02c38a35f0680c06c3020ec66aa3e58..3085ca111bfc20bf331ffa6f099e9610997e907d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -70,7 +70,6 @@ #include "tid-parse.h" #include "cli/cli-style.h" #include "cli/cli-decode.h" -#include #include "break-cond-parse.h" /* readline include files */ @@ -7860,7 +7859,7 @@ check_longjmp_breakpoint_for_call_dummy (struct thread_info *tp) /* We would need to delete breakpoints other than the current one while iterating, so all_breakpoints_safe is not sufficient to make that safe. Save all breakpoints to delete in that set and delete them at the end. */ - std::unordered_set to_delete; + gdb::unordered_set to_delete; for (struct breakpoint &b : all_breakpoints ()) { From patchwork Tue Mar 18 02:14:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108260 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 E1EE53858D3C for ; Tue, 18 Mar 2025 02:19:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E1EE53858D3C 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=Tp+WgdKw 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 934FB3858CDB for ; Tue, 18 Mar 2025 02:15:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 934FB3858CDB 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 934FB3858CDB 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=1742264100; cv=none; b=n0kGPmaZYmR+kA5S3Qqit5lz2bdxT+yM4EHs5X5dvzjxKG0jDOoqNBZBITqN726AnG94caNKCEdz5c/y7DO1YYoquYAmONm+9vKy43M4YQMDWciNnF3BL5/8lWV2rqV6d3RMUt3LkXbl0LHNB+eIFfASStQoFVCetKr8mK7h+4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264100; c=relaxed/simple; bh=dup375PDAJY2Id+InqRMNeqtp0zMT2sQjmZx31IJGBo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=N8eElGtESHXLLfs9dDYAN+NinRcl0Y+g57LokLksocTbcgEfIoMBmJUa/tDwWd/wCEBhLxmKAa7/UMbVBSOIYCd4mTDCRxDcqclDC3299g5mVa7fGRzslteYLTD1KDO8YuJJa5exzwGF1CsahO+BW1dhBZmvAx5SgLMmf13jQ8Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 934FB3858CDB Received: from eig-obgw-5009a.ext.cloudfilter.net ([10.0.29.176]) by cmsmtp with ESMTPS id uKNItS9VOzZPauMTst8tR8; Tue, 18 Mar 2025 02:15:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTrt2nDeaBenuMTrt6PXZ; Tue, 18 Mar 2025 02:14:59 +0000 X-Authority-Analysis: v=2.4 cv=I7xjRsgg c=1 sm=1 tr=0 ts=67d8d723 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=jD563CIPeVfMyGcmb10A: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=epwAln3HZRhyG/EKQAaNBCS2IcNVUES0j6Tr4OA0Wr8=; b=Tp+WgdKwdbQeIrF6pkf4E0h0f2 1lLUIUUhTZrBcVv4ie1Qysz3h/3pFXDP0w+OQs7CD99gGIoyySL+hZUJrQsl3aHLdy5bkM96YOz1e PbnpT2hzheDw/smNinHEQ7lxD; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTq-00000002cIx-3Ot9; Mon, 17 Mar 2025 20:14:58 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:56 -0600 Subject: [PATCH 03/19] Use gdb unordered map in dictionary.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-3-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTq-00000002cIx-3Ot9 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfHJqSVNBCl7oMzPIjwmUVT2VN3P/p7yj1Vo2k0DNmqpNqBcgtfcpwDSK8Tcl75CS8qyRsB1Xl99y2DAWFnNL3gn+9e9kB+uGiYckkQvOaxe8DpyhBFaP QgzMh+lIMtLXTdmrpqVobPQEzjGTp8x2d5pEqiBo/CUq/++Guc5vfi5vbUrVyO+suRJza9XEP3WTfMM43kQBK01/CmTlS1YuXv8= X-Spam-Status: No, score=-3016.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_BL, RCVD_IN_MSPIKE_H5, 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 dictionary.c to use gdb::unordered_map. --- gdb/dictionary.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/dictionary.c b/gdb/dictionary.c index f617b8f967f87b9c177d5470158b02c91986e531..f673877338c9b012ed9b7a149e6086975604a5bf 100644 --- a/gdb/dictionary.c +++ b/gdb/dictionary.c @@ -26,7 +26,7 @@ #include "buildsym.h" #include "dictionary.h" #include "gdbsupport/gdb-safe-ctype.h" -#include +#include "gdbsupport/unordered_map.h" #include "language.h" /* This file implements dictionaries, which are tables that associate @@ -917,10 +917,10 @@ struct multidictionary /* A helper function to collate symbols on the pending list by language. */ -static std::unordered_map> +static gdb::unordered_map> collate_pending_symbols_by_language (const struct pending *symbol_list) { - std::unordered_map> nsyms; + gdb::unordered_map> nsyms; for (const pending *list_counter = symbol_list; list_counter != nullptr; list_counter = list_counter->next) @@ -943,7 +943,7 @@ mdict_create_hashed (struct obstack *obstack, { struct multidictionary *retval = XOBNEW (obstack, struct multidictionary); - std::unordered_map> nsyms + gdb::unordered_map> nsyms = collate_pending_symbols_by_language (symbol_list); /* Loop over all languages and create/populate dictionaries. */ @@ -988,7 +988,7 @@ mdict_create_linear (struct obstack *obstack, { struct multidictionary *retval = XOBNEW (obstack, struct multidictionary); - std::unordered_map> nsyms + gdb::unordered_map> nsyms = collate_pending_symbols_by_language (symbol_list); /* Loop over all languages and create/populate dictionaries. */ @@ -1132,7 +1132,7 @@ void mdict_add_pending (struct multidictionary *mdict, const struct pending *symbol_list) { - std::unordered_map> nsyms + gdb::unordered_map> nsyms = collate_pending_symbols_by_language (symbol_list); for (const auto &pair : nsyms) From patchwork Tue Mar 18 02:14:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108258 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 7B5B33858C39 for ; Tue, 18 Mar 2025 02:18:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B5B33858C39 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=S1aTbbhb X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 5C3693858405 for ; Tue, 18 Mar 2025 02:15:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C3693858405 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 5C3693858405 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; cv=none; b=wvYkCXacRFSLHjgZ/vfAxnvuIkGYPmrgs/KgG1de/bMrJTgaJugzEwt+Jjnx40zvOi5XCwC6hryvlqedWrYnviWIDvJmt7hnAhH3WB5NI9282hsy3b/AKBH6haz7J0il3IuPF/93fYokKxs4BjmpS7uf5Pu4wXbczUpFFM+Kl+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; c=relaxed/simple; bh=7Aay+9Pz/obfbKaceXDhcfFRiB1zz5TA8okLWIvFhOY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=FLfyDEMx9oWVrV1pr9r/kBcaqfBCaCO8UEL6qjQrb9KmLMjiEDA6/Mu43u99sbs6g/WRlu1ZuQsHScfIl7X/n8tf2Ixsqd+8nsNjugWB0fvxr6vNIkwB9h81b3/w98CLbXjNwF5+pPiivXx8dNMYkmDCie+eQH4VlcRlsFf1Q+0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C3693858405 Received: from eig-obgw-5001a.ext.cloudfilter.net ([10.0.29.139]) by cmsmtp with ESMTPS id u6KKtDkZDf1UXuMTst4Ako; Tue, 18 Mar 2025 02:15:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTrt8IfaRxIGuMTstQQzR; Tue, 18 Mar 2025 02:15:00 +0000 X-Authority-Analysis: v=2.4 cv=N/viFH9B c=1 sm=1 tr=0 ts=67d8d724 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=CfjcjvoCIJBi1k_JePwA: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=NS05ErO1O8Flmt3H5ABn09jz8FPEe50vyEQw1hPaoPo=; b=S1aTbbhbf5P+5Kd2cm/Tt596Oz AWlfaXgwfqNO0Obp/y9EHG+nB1BnV4SbXOlr1E4OgLTAGmpEg0nmNftPIT9zX+1BobWSz9AXpwA9p CAxzTDLxn2ND1R1BxPo1f6lDd; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTr-00000002cIx-0oGe; Mon, 17 Mar 2025 20:14:59 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:57 -0600 Subject: [PATCH 04/19] Use gdb unordered map in gdb_bfd.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-4-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTr-00000002cIx-0oGe X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfNmkIpEv7KO/xDdjSM/jtPaYyTPPryeAU+TU9N8/LXiwUa3UwSFm+dol5QWPY+eOr+k6xkv7AZWm8TTWyU5aRHXjongLTikm/eGqVZ2Wce/0sbHVbVX/ vENn2yQCpaqWNS+qt1lXl3zj8gqGw9OpNpC1xrxVGU8BflUpUx8akC7zuhnbjROXsoRwq1jcxIAkJy9KB8a+lYwRki3ecANCit4= X-Spam-Status: No, score=-3016.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, 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 gdb_bfd.c to use gdb:unordered_map. --- gdb/gdb_bfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index c233551b4e8b51ce577ab8fd7e1f8bebdc52ca6c..8380c5377a526d0624d0d34e9469f1016e4686bd 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -33,7 +33,7 @@ #include "gdbsupport/fileio.h" #include "inferior.h" #include "cli/cli-style.h" -#include +#include "gdbsupport/unordered_map.h" #include "gdbsupport/unordered_set.h" #if CXX_STD_THREAD @@ -1207,7 +1207,7 @@ maintenance_info_bfds (const char *arg, int from_tty) struct bfd_inferior_data { - std::unordered_map bfd_error_string_counts; + gdb::unordered_map bfd_error_string_counts; }; /* Per-inferior data key. */ From patchwork Tue Mar 18 02:14:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108263 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 C1CED3858405 for ; Tue, 18 Mar 2025 02:21:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1CED3858405 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=e1QCbV+X X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id 991FA3858406 for ; Tue, 18 Mar 2025 02:15:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 991FA3858406 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 991FA3858406 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; cv=none; b=DWAAnt69+R4CBcpFZOkwuRCTI9C/VBbLVD0pv5SsYHp02qhIAxmA/T9EETLP/5+gvAXdJ9pYpoiUHz9/cmagYIXFvYYSW1/q0M9TLl1Cu50WQWOwwG+jAsVHO2BIE29yRG84wEjoHoEXKq/YOjJj3aBvAdDXrCfdJ2lburBHHdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264101; c=relaxed/simple; bh=NiKDIHgRETF6abcVVbmijPs25LDK4zHrvrE9qQ+h7dA=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=oY68OGMedUCEfiw8wYL2K5logK+0jsMVbTxnTkQiWL7ajFF6zTxOw+U9j1kSUGHAf+DJj+JVMSBoKgy6KiHa/8lwY8J4Y7Jo+US5RpNPRo/ZSm9u3di5EGowoQ7hOHSqVYM2xDEkow2gADVFQfkCHQDbp4SMmI3DeYjS+Bl4FA4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 991FA3858406 Received: from eig-obgw-6002a.ext.cloudfilter.net ([10.0.30.222]) by cmsmtp with ESMTPS id uLjWtyKxdWuHKuMTstodZo; Tue, 18 Mar 2025 02:15:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTstjlC01vNyuMTstxgmZ; Tue, 18 Mar 2025 02:15:00 +0000 X-Authority-Analysis: v=2.4 cv=VMQWnMPX c=1 sm=1 tr=0 ts=67d8d724 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=IByvOll14ndvqz7OERMA: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=Fi8jmfnoreD0QQZ6EYWjo4fT+ABuhq/yp8bbvWwLLd0=; b=e1QCbV+XJxRzb9eUBczyiFTXsH yn1tv/UiljV37A22q8lrilpAKPdoqhugC/b6zidSgozMLeacBdk2JgDCphU+Ix9LdmL4+1i2RaLGW E+gqfH0a1T9WkiPihsRqsrP8I; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTr-00000002cIx-2Rfy; Mon, 17 Mar 2025 20:14:59 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:58 -0600 Subject: [PATCH 05/19] Use gdb unordered set in symtab.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-5-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTr-00000002cIx-2Rfy X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJnggOl1ZhxPWZ5kqYGK4qz2fYsGw/sXTYZA0HoAFAmghdwROhUIJXn1XLHd3pLvg7rdTztM89kI+6Gl0gBbPKuaojurBSmXflFGQ0Ud4InzC3TSL9aL P/6lIuwUQt3ykec9uY3YlaenXEovrjSLsVZAIjtPVbSpSi7DHHOLjebJ5Y6UfwEKYkMhyYZ3DAQ1j2d45RY7FrXip7KesTvvc58= X-Spam-Status: No, score=-3017.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 symtab.c to use gdb:unordered_set. --- gdb/symtab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index aa09706453c120c56195e994df053e81a577a2b1..06e2cd5b87756a2d53c6a4c427cec1e44cdeddb0 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -75,7 +75,7 @@ #include "gdbsupport/pathstuff.h" #include "gdbsupport/common-utils.h" #include -#include +#include "gdbsupport/unordered_set.h" /* Forward declarations for local functions. */ @@ -5623,7 +5623,7 @@ rbreak_command (const char *regexp, int from_tty) spec.add_filename (std::move (file_name)); std::vector symbols = spec.search (); - std::unordered_set seen_names; + gdb::unordered_set seen_names; scoped_rbreak_breakpoints finalize; int err_count = 0; From patchwork Tue Mar 18 02:14:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108266 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 C4EA73858415 for ; Tue, 18 Mar 2025 02:24:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4EA73858415 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=ce/XRd8R X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 24A88385840B for ; Tue, 18 Mar 2025 02:15:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 24A88385840B 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 24A88385840B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264102; cv=none; b=v5jvGXgHD0JID4jQ5a9W+33MjTWO9xQ1ljLZcOEWw7WezTHYevYKY/IuElxT7QD8td4nkehv7hErtxB7nF3fU3JCe7lq5YvvCJdimv8t9+UJcM1jTt5S08xTwPjVqbr3/i6YuRZBlrjxmZ+60wB9RzZjNMJi3+vHsXd6X6+489M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264102; c=relaxed/simple; bh=lCQnzQ9SM+sVOR6OfCBGJNYRq79ApVb3ZIZySQAkxQM=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=isXGifp3nNCnRDxbNJIqxKCS5AUwXcEXnu8W7Cx/8uYNI2gtv+3lS610+wZBx/+2EpNLdohrbgsLuOVUNl/rqRj6urIEpzZB2nl3sePcvobD98tL3zuuax/ATFnLwY/lS5/rrxDjeNfozRmKBeOu8A42bIl7HTHr7eQ0bf0jIY0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24A88385840B Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id u4vVtOfOOVkcRuMTtt98JB; Tue, 18 Mar 2025 02:15:01 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTstnQQw8krvuMTtt9vu3; Tue, 18 Mar 2025 02:15:01 +0000 X-Authority-Analysis: v=2.4 cv=PouVbRM3 c=1 sm=1 tr=0 ts=67d8d725 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=l-Y72xOjW5QFzXDLog0A: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=/02D/XSW6YQf5AQi2yoculhAsVxGsF3yemSnKMOqliQ=; b=ce/XRd8RIrf00+y7E+wWqsEGnZ IA6U7mcW3tcydjgAWZu5OUMQQSIKfutspMBKX2vQ8HUlHBXlAoyBvyHndnAoRJsuu8UcvQs6C3BSv NEVHlwd+CQKWS2IVHsI96wquy; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTs-00000002cIx-0uaH; Mon, 17 Mar 2025 20:15:00 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:14:59 -0600 Subject: [PATCH 06/19] Use gdb unordered map in ada-exp.y MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-6-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTs-00000002cIx-0uaH X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfD/DiPh+Oq9Sxu2+KZtIqEXJ0goxGt/RoV8+m3JItAsbIYETNHyafGugUSnmB7Nr7lP2HYpMHFLcZCUdK3sT7Rwg+1wJnd2SgK5LmLALfSrDHKQ0BQjj QOojPXzt1hOYUAc6rHYiBA17i92dK5pNIqZOQ4LSvHwScobKWgDr8H7IB7QrEREYBDEp6UQ6BJGbJSReLLtVUdsAPVR23N1Kr1I= X-Spam-Status: No, score=-3017.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 ada-exp.y to use gdb::unordered_map. --- gdb/ada-exp.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index cffeada7695922b71545a427f162179328204389..b25639ecafb9380234f6f1d90bb90042a1f1d03b 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -36,7 +36,7 @@ %{ #include -#include +#include "gdbsupport/unordered_map.h" #include "expression.h" #include "value.h" #include "parser-defs.h" @@ -98,7 +98,7 @@ struct ada_parse_state std::vector assignments; /* Track currently active iterated assignment names. */ - std::unordered_map> + gdb::unordered_map> iterated_associations; auto_obstack temp_space; From patchwork Tue Mar 18 02:15:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108271 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 33E6B3857C68 for ; Tue, 18 Mar 2025 02:27:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33E6B3857C68 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=Xia+9PSh X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id 2F17C3858415 for ; Tue, 18 Mar 2025 02:15:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F17C3858415 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 2F17C3858415 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264102; cv=none; b=pI7Yee3L+CbOt39uI9LBxjI+hUzNDEhHxt71w3zUKOJmXDehqerUFHGOu7l1rPMWYz+HRqvHxW1UtzSyUwPkXO7gAFvlK5Ht3uhxR/MADV4JbAzYrDc44JBkhQHa7HKhZ0uJOSXmGmqYDsb5yGdoDfgAeiH3OkbmQLTMJGN6yhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264102; c=relaxed/simple; bh=hxTBPBeXm+xHVKG2b+J58fvb5GlW/4P6R2g4W2KQ/YY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=leAYbJkterLsEioiG5FjZ0LZlNoTQbpK+oFk2N+WY3uheWEEoXkwxRwztBQXC7MlGofhqsuQjylB6pxE8x3tUpsqywiH1mudv17UeqIAa0+Kw0I5uK/WKiWhlvqXyq6GDJ2zC/r+uMvRA0GCXYL6fQZ4yjfcOJGYkgZWGLYdPFg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F17C3858415 Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id uLP8taCx9iuzSuMTttc7aO; Tue, 18 Mar 2025 02:15:02 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTttZt5LSasJuMTttOBNp; Tue, 18 Mar 2025 02:15:01 +0000 X-Authority-Analysis: v=2.4 cv=A4dqPbWG c=1 sm=1 tr=0 ts=67d8d725 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=6z-Xh9hGykqmcGiSVpEA: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=ucl0t+004i3VL27UASCbs3X6Hm3IHt6DKyg5lmC34h4=; b=Xia+9PShwfqowZoYywreeYbv5E G5/RZ12HjqD+FoKnlQiJvH4K7EBpx1Earn26UXMolRPC1xvs7rmTBvTj9e7/BSWGVHzhUrWQPOhvT fpW7AQaG7+aSz5k5QvLDodWEH; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTs-00000002cIx-2loN; Mon, 17 Mar 2025 20:15:00 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:00 -0600 Subject: [PATCH 07/19] Use gdb unordered map in inferior.h MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-7-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTs-00000002cIx-2loN X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 8 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfN0ScT5bTn/abuCtolt+AZ0Tm/DDlPDgYnqwbOx49pnI8jiSNkFhjqVpZMfS2iksMAU2CTb/ZC53zrD3Un/KEOHCXgzeYtmCsvo8BX1ZTBlMjRUtKcN6 Cm0w89E6oUmMTVrI1hrLY/ZEX+vSQGt6i4SOk3tQKcqHAL0B7IZjb2Rcs2gX2LhUXCSZ++RbiPGp5WiztUsEDeEO1R2kXpmaYWE= X-Spam-Status: No, score=-3017.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 inferior.h to use gdb::unordered_map. --- gdb/inferior.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/inferior.h b/gdb/inferior.h index 10f00a1a91442b3a98b0edcdeaa25d581c82e9c7..3d9f86c0d4a4c5fc9a4b7402eeafbe73ebb94d72 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -63,7 +63,7 @@ struct thread_info; #include "process-stratum-target.h" #include "displaced-stepping.h" -#include +#include "gdbsupport/unordered_map.h" struct infcall_suspend_state; struct infcall_control_state; @@ -459,7 +459,7 @@ class inferior : public refcounted_object, /* A map of ptid_t to thread_info*, for average O(1) ptid_t lookup. Exited threads do not appear in the map. */ - std::unordered_map ptid_thread_map; + gdb::unordered_map ptid_thread_map; /* Returns a range adapter covering the inferior's threads, including exited threads. Used like this: From patchwork Tue Mar 18 02:15:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108261 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 4081F385801B for ; Tue, 18 Mar 2025 02:19:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4081F385801B 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=IBQBv3C4 X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 16765385841E for ; Tue, 18 Mar 2025 02:15:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16765385841E 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 16765385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; cv=none; b=ccbhYF/H5MfB2pDfEv6Bmkeuuh1m62ye44rljEmo+enVwsXdyyrjTCi9b+f7HgFL7aqtPPfV+YQy+8aZKKpymXAu30DbCuJJnSplPX7rqsSpO73tqv8/HH/FO9UJlA0Bp3F9Rg1GH2GmwPByLLKcXAQCpzeiui8j97eLPkgzBAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; c=relaxed/simple; bh=GBYO/p61ASsMFe4rffoaq5EQ12kEiynHQl5ti7gV/u0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=btsGlNYIw0dG5yS9LC5jCgwDItGxzuJqTURZRzy4AEPlRE989SRGM8wNHy2xtiFeaTaxxYu6tqK8prYNVlQfCul+52d2YVlnZ+Vmh0KaySHs+ui2mB71n4w7PV9GxInm7UlscNkrGc3kvpvRkNlmE6EYG+7vlWu3v1kM7UKsEzg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16765385841E Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTPS id uMFRtTHOfVkcRuMTut98Jn; Tue, 18 Mar 2025 02:15:02 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTtt46FHRlrsuMTutlHaq; Tue, 18 Mar 2025 02:15:02 +0000 X-Authority-Analysis: v=2.4 cv=Qamtvdbv c=1 sm=1 tr=0 ts=67d8d726 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=_x8DlbaBwG9R9ERQXxkA: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=QtnIsjH78JOnqgNhSIaD7F1QwfrHBxIQLN/6Gkajokc=; b=IBQBv3C4WqoHHfEDwkLR1fLTrr 44vPqFR4meDv6w9XYgLhsBotxhLE+7F9QKniDVIIsk3GqCub6UeP2JkvfCrAwqN7XAtLZf/Z+hA5v psBEYhLRAvuL1VN6CY7EsWCjh; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTt-00000002cIx-0aL0; Mon, 17 Mar 2025 20:15:01 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:01 -0600 Subject: [PATCH 08/19] Use gdb unordered map in stap-probe.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-8-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTt-00000002cIx-0aL0 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPruAVbQ9+Fy9W10JkL41YUYpp2pYDV6q3d3wnu7DLAjiBPh7M+Z1jSlbBXOPkVkrpeu1/m533HoBHDowX/INB23dzrGG1g+YStE+Eo38KzNJVocF0Yd ydaN1bNWUJ0+XbbILNeQaMquQeak2z6wv6oJza6lB7UOoqkA7us4PUTLmzFLf4+QdUYosZPmTTJJk3ML/kBZP9Gk0tGYUoULi5Y= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 stap-probe.c to use gdb::unordered_map. --- gdb/stap-probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c index 38ea199edd766c603ceb8251a2ec96fa7d10b0cf..b312b38db04670b2b1d7b5a0ea2eaf57a42b5bc9 100644 --- a/gdb/stap-probe.c +++ b/gdb/stap-probe.c @@ -37,7 +37,7 @@ #include "language.h" #include "elf-bfd.h" #include "expop.h" -#include +#include "gdbsupport/unordered_map.h" #include @@ -434,7 +434,7 @@ typedef expr::operation_up binop_maker_ftype (expr::operation_up &&, expr::operation_up &&); /* Map from an expression opcode to a function that can create a binary operation of that type. */ -static std::unordered_map stap_maker_map; +static gdb::unordered_map stap_maker_map; /* Helper function to create a binary operation. */ static expr::operation_up From patchwork Tue Mar 18 02:15:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108265 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 D7148385840C for ; Tue, 18 Mar 2025 02:23:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7148385840C 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=dQj9waQx X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id 8A4473858424 for ; Tue, 18 Mar 2025 02:15:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A4473858424 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 8A4473858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; cv=none; b=LzJNvtyp/HeEvfeBKuaODj8/Lfzq7dS/ULY4OELSEHBiQAVLIS3QeWrTRz8YWegOjUMKb+cr9Wt+KMXYnvzC+rq6d+1rgdDwsyPKRnePwPgQgSlgVLc6YMKvhPxQP9VIMdg2V952adVmbQcd7NlpEmD5oxKOovoxVzX/DtgvWBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; c=relaxed/simple; bh=kwO91Z+2cGra0ctanZA6mmpWxBTdc7TqtguLNpCoWjk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mwacNiLE3Bcov+/DLNcuOmDl7RHvgAZ34Oqr2QKtoyWsQN7UWg/IHbS0jT07FOzv8P+/MV80d/9crH5baeb3iXpggdQb3x6GzrHK47A6NE5Exchga6hVZHPLre29Cx7ptcqZRYZICJEhL8B3dtlpTwICX3UrZ8EeSYr1lH1tgqQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A4473858424 Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTPS id uDlttYCBciuzSuMTvtc7bH; Tue, 18 Mar 2025 02:15:03 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTutgOCKh9ZxuMTutwn7x; Tue, 18 Mar 2025 02:15:02 +0000 X-Authority-Analysis: v=2.4 cv=GODDEfNK c=1 sm=1 tr=0 ts=67d8d726 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=P1DBSZlDPrl8jKiv5j0A: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=urKZ4ZcjiuIr7FKwRt3tCRSEsxUvqhtDWC28PFketX4=; b=dQj9waQxFyNJjpxCldNMTGImDY ltJ8caeXmqci3alYa4stCUo9EbGie1AQ62zqihpWBbltvrj0h+B3k4sTHxbEVwcj8XSgBWhOY4w1h 9j3oEFos4+4CaLml8t57M9I4N; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTt-00000002cIx-2jw8; Mon, 17 Mar 2025 20:15:01 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:02 -0600 Subject: [PATCH 09/19] Use gdb unordered map for complaints MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-9-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTt-00000002cIx-2jw8 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfISoOOsTJ+9qYVfxPS//d6g8dPHRuJ2ti8fjZsLLp2Oa9aRjRFacDrZ/c+owrOhscyVkXwf4+3DRuwfUCrIQm1TDejnbxdGxkHvHJ902/hZkUXwbRwOL UTSQvF9RvZ/zpDhSlPd0QJiicRdY0Ha7w4FWJKojVGA61V9ZZjjLDiBowoBaktoyDTfMSBNWVnv1RhVTrriNYp+oNyFneFH1DbU= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 the complaints code to use gdb::unordered_map. --- gdb/complaints.c | 6 +++--- gdb/complaints.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/complaints.c b/gdb/complaints.c index b50bea846790cf83fe09ae04c83c2f786f34311b..80b358c8dd165d7ed432563dea0f1a46833d30d1 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -23,14 +23,14 @@ #include "run-on-main-thread.h" #include "top.h" #include "gdbsupport/selftest.h" -#include +#include "gdbsupport/unordered_map.h" #if CXX_STD_THREAD #include #endif /* Map format strings to counters. */ -static std::unordered_map counters; +static gdb::unordered_map counters; /* How many complaints about a particular thing should be printed before we stop whining about it? Default is no whining at all, @@ -149,7 +149,7 @@ namespace selftests { static void test_complaints () { - std::unordered_map tmp; + gdb::unordered_map tmp; scoped_restore reset_counters = make_scoped_restore (&counters, tmp); scoped_restore reset_stop_whining = make_scoped_restore (&stop_whining, 2); diff --git a/gdb/complaints.h b/gdb/complaints.h index 3d0e0babd836a667134edf4b6ecb22a5b3d53490..20650671404be9988a0b58a976d1b1aad6e83045 100644 --- a/gdb/complaints.h +++ b/gdb/complaints.h @@ -21,7 +21,7 @@ #define GDB_COMPLAINTS_H #include "gdbsupport/scoped_restore.h" -#include +#include "gdbsupport/unordered_set.h" /* Helper for complaint. */ extern void complaint_internal (const char *fmt, ...) @@ -59,7 +59,7 @@ extern void clear_complaints (); /* Type of collected complaints. */ -typedef std::unordered_set complaint_collection; +typedef gdb::unordered_set complaint_collection; /* A class that can handle calls to complaint from multiple threads. When this is instantiated, it hooks into the complaint mechanism, From patchwork Tue Mar 18 02:15:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108272 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 BC4DD385770D for ; Tue, 18 Mar 2025 02:28:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC4DD385770D 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=F+tDhO3r X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id C221F3858290 for ; Tue, 18 Mar 2025 02:15:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C221F3858290 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 C221F3858290 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; cv=none; b=HA6pbXoa52QBE2EbzHlY0P1a28rBKtsI6vm7AcXAsGPR6HgnY42ZuaI8ilOX4EvPIMzOOfVUucbD81eJ5PApkm1Tphix0V/iGZbvxnFa99Cqoq1iuxhbO2ySdzM+8Sj4b5BO9I9v35gVsIrtcurSs1n1gtKPXJKXTOkmQyAIMAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; c=relaxed/simple; bh=HNNmetMD/MSoKFaBTC0asUHuG5wQOvpTpmZIohbdpgY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Y0vE+JbiSTqiQl7dDRPjvdrbgvT0LbnMdvTeaWa/j+GEFHJ42sCnd3f2P8lyw+8zHrXJ9SbBJvEFtwLfaXL0MQvRREck1thNkxVNXyCJP7DkQECIeoWSGTenFm3zJgFbLMqdFtcEaGgFFcK9lnzODQE82s14HtkRuLvokQ6LZe8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C221F3858290 Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTPS id uMFPtaNA9iuzSuMTvtc7bg; Tue, 18 Mar 2025 02:15:03 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTut46H2RlrsuMTvtlHcU; Tue, 18 Mar 2025 02:15:03 +0000 X-Authority-Analysis: v=2.4 cv=Qamtvdbv c=1 sm=1 tr=0 ts=67d8d727 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=-F2a4V31O3Ri0B3Dh1gA: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=6OsbRzbOInuXSzY/sC/ZiCZIxV4aSfqgNQdTuCZB3E0=; b=F+tDhO3rUHcIJepBDxiHUr7Mq0 Tcq28GH0c++jlaEGV4tKBpMuFFxPtp8pn3jM5J2ejKye5ir8HJr5fcYQzrW9GNggKWWhwbofFSOHa /0TU73GbvxcZbFYTEhDfwueth; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTu-00000002cIx-0YNI; Mon, 17 Mar 2025 20:15:02 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:03 -0600 Subject: [PATCH 10/19] Use gdb unordered map in linux-nat.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-10-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTu-00000002cIx-0YNI X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 11 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfMDgQRdnqg55tY0pk17RheQZNBQ376/KZ6sWQMTbyLQrLf/tyH8dVs8yn2JDHPnM4VpAwZX74XoA2eBgKnLK6ufBGzgdKMGCj8RMDzgjajYE23Za5G7w 0lUbgs3okdILA3wS2CcmYpDwBECJoUjvrWo9tMl6uWM4SSRAeIoF6CXgjzqduL16WKjseEwNDJ70F0iq+2uMy0h9tNAsXy/o+jM= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 one spot in linux-nat.c to use gdb::unordered_map. (There are still other spots that could be converted.) --- gdb/linux-tdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 735d20dc05011e558d46819108e41a251a8ee154..fec6a6343d720d4a8d9a801dbe3ff4581b5c9a05 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -44,9 +44,9 @@ #include "solib-svr4.h" #include "memtag.h" #include "cli/cli-style.h" +#include "gdbsupport/unordered_map.h" #include -#include /* This enum represents the values that the user can choose when informing the Linux kernel about which memory mappings will be @@ -1189,7 +1189,7 @@ linux_read_core_file_mappings warning (_("malformed note - filename area is too big")); const bfd_build_id *orig_build_id = cbfd->build_id; - std::unordered_map vma_map; + gdb::unordered_map vma_map; /* Search for solib build-ids in the core file. Each time one is found, map the start vma of the corresponding elf header to the build-id. */ From patchwork Tue Mar 18 02:15:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108269 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 4CAB5385771D for ; Tue, 18 Mar 2025 02:25:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CAB5385771D 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=m+6JH2oM X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 4BBF0385800F for ; Tue, 18 Mar 2025 02:15:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BBF0385800F 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 4BBF0385800F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264104; cv=none; b=VbaPui1PrxhDxVORO1PbcWBP7V47VTDP3Ougomcf1Ebp6nNv0Hg5lHcR4r1+Ra5U2weJXEa52t7KyvWqRVfBRPLdXcqzGjKXMGxllRuk7jBbsKR/ZfMFD6l621pliWA1YlURQQn3S/BgsqmXcXaCiVcABmoozR53EZibODH3WVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264104; c=relaxed/simple; bh=EZrhA/S9GhcW4V9IbfjwdKRXqbYxQmds2/QdGzxFOsA=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=go8TxizfvPRgTCGkqhLo4g9tvOVIr/9xVfS2HjHd1yo3DSnc/G30GyuoYYmfsNgDQ5U2MAOOx5anOgB/gevR0v9iwedso6PnoZ/V6OlAEFnFPaiSKBc34mYpcKkcv2yzN4DJjonmN6GGrQ12Zn2vIOv+u49S1OE1LUEjwDT+qJs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4BBF0385800F Received: from eig-obgw-5002a.ext.cloudfilter.net ([10.0.29.215]) by cmsmtp with ESMTPS id uFRvtRdPxVkcRuMTwt98LX; Tue, 18 Mar 2025 02:15:04 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTvtyizCJ4PguMTvtRJE5; Tue, 18 Mar 2025 02:15:03 +0000 X-Authority-Analysis: v=2.4 cv=ZaLWNdVA c=1 sm=1 tr=0 ts=67d8d727 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=M-arFxfq_70urDab1-oA: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=jIHh7G6W4lEEward8DNyHIGhyYQ7fSpHifIdN9lWn64=; b=m+6JH2oMiZ95quOAG83AbeRoVg 4LWAInFcWd/ONOVqeljW7eNsDq2QnFwTBftLA2Lg7a0MqxP+K48M7/T0ZGWcvjUpMmzmnDKtFK5JJ xkWPFAzs+vN1RubiVdlFQubXo; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTu-00000002cIx-2vd6; Mon, 17 Mar 2025 20:15:02 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:04 -0600 Subject: [PATCH 11/19] Use gdb unordered set in linux-procfs.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-11-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTu-00000002cIx-2vd6 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEc+2px/QYIwiy7Tlenb/ySAwh7soKMAQbwuSrbZ1BKkxJSop3NaqqZjU6WuWdHuOqW7l6dgd8ATB8NNe7ChkrHg7pasrEELisa6jfQ4okLeA19WbiW2 ESrFMhTY+xfNqkjDG3Rn172RimQjneR9LLFqklBk/Jfd2IwBWOusakaPXg1B9ijO/sYjlcNllmKjgurtKgQRwNofJh11ZU4Hxtc= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 linux-procfs.c to use gdb:unordered_set. --- gdb/nat/linux-procfs.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gdb/nat/linux-procfs.c b/gdb/nat/linux-procfs.c index 5efc86cca1f4f135c475159ed78fe72ca6a7c927..d7627138e45b1353cd681d4ca81dcc7a6c6a2e9c 100644 --- a/gdb/nat/linux-procfs.c +++ b/gdb/nat/linux-procfs.c @@ -18,9 +18,9 @@ #include "linux-procfs.h" #include "gdbsupport/filestuff.h" +#include "gdbsupport/unordered_set.h" #include #include -#include #include /* Return the TGID of LWPID from /proc/pid/status. Returns -1 if not @@ -358,20 +358,9 @@ linux_proc_attach_tgid_threads (pid_t pid, return; } - /* Callable object to hash elements in visited_lpws. */ - struct pair_hash - { - std::size_t operator() (const std::pair &v) const - { - return (std::hash() (v.first) - ^ std::hash() (v.second)); - } - }; - /* Keeps track of the LWPs we have already visited in /proc, identified by their PID and starttime to detect PID reuse. */ - std::unordered_set, - pair_hash> visited_lwps; + gdb::unordered_set> visited_lwps; /* Scan the task list for existing threads. While we go through the threads, new threads may be spawned. Cycle through the list of From patchwork Tue Mar 18 02:15:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108275 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 31B2E385801B for ; Tue, 18 Mar 2025 02:30:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 31B2E385801B 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=siFa3rQl X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 17D74385801B for ; Tue, 18 Mar 2025 02:15:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 17D74385801B 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 17D74385801B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264105; cv=none; b=op79xSt4PMGN9Mo4KsTXpfVrXR2ni5Io9OttryPDUgSN5ybqk6k1+O+mMRq7ZRV9TduIuoC3I32syyV/FmqJac+GI5qYUZXKLHuRH0A4a6XdCoLc80u23Kwf0NJg3UbJj6RBJkros9mKCiXDlahlwPuLwXwfR3yGrcNsMfgarLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264105; c=relaxed/simple; bh=n0uv42PO9ifv2zhc9hxAYQFXXcwnspRyzi8R860figY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=xTlVO2KTIhFXqLWaLuiPmaiC9LJbcozhbD+IsVvbILJgJoC0J0KAmlUuvLG3bRpfQ3BZMFc3wbrSYPXeYo6aPQ/WyBGsRLyR7a5TBlsMDKEg7A8SEbJdtwFwYxQCqXE5eLRLXEvd2I3ZsZA6TmEyM2l8mBYOFiLFLcKAdQAm4dk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17D74385801B Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id uIVAtkI7sAfjwuMTwtJ8qK; Tue, 18 Mar 2025 02:15:04 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTvtZtA2SasJuMTwtOBSJ; Tue, 18 Mar 2025 02:15:04 +0000 X-Authority-Analysis: v=2.4 cv=A4dqPbWG c=1 sm=1 tr=0 ts=67d8d728 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=iYy6sDDPGJvXyyN3RfIA: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=qt07+xOad/jMQ67vdISYH8YjOjkcVITn51l+3R90jOA=; b=siFa3rQlHic8GGO6Vo79PMje/d OIM38R+yQ3Qs+oAvZ88nfyy1CD0W0TFHicLozmIprkbQB+wCLLkuIa8M4SLJhuhjZRwABgfDW5ytD 7/EsRVWb0cMwTUqHwdic5ZvPf; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTv-00000002cIx-0oTM; Mon, 17 Mar 2025 20:15:03 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:05 -0600 Subject: [PATCH 12/19] Use gdb unordered set and map in Python layer MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-12-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTv-00000002cIx-0oTM X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 13 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJkRZxgiaLZlkZDriEO5XQ3BchYCH8WMHTQPMtWpJhU5C2dnWUYfUvnURSlCXJV5C9/nJrfhKI9wbm/cR5G0WNvk39ZlXcK0v/9D35ZnXSZ18AmHybxr tXeaHIQzTpMJXEaCT0b/e4JDl37NXmVryt1947NEu0FSfRTOgTX5k10BJ3xvhBopUgy23vRVMJ5CDi4flKzdhNSrUtTCne9GA2Y= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 a couple of files in the Python layer to use gdb:unordered_set and gdb::unordered_map. Another use exists but I think it is being handled by Jan's series. --- gdb/python/py-inferior.c | 4 ++-- gdb/python/py-registers.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 60bf56d17def31ce8e7a52dcc497f6e851b288b6..d11ca9e6506949441d1706a43136256328588d15 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -30,10 +30,10 @@ #include "py-event.h" #include "py-stopevent.h" #include "progspace-and-thread.h" -#include +#include "gdbsupport/unordered_map.h" using thread_map_t - = std::unordered_map>; + = gdb::unordered_map>; struct inferior_object { diff --git a/gdb/python/py-registers.c b/gdb/python/py-registers.c index 229dd62a826aac2beb2bf65770e6bd0c1ba73a87..75f99e510719f9bb163eefd8efe93f16a7da964e 100644 --- a/gdb/python/py-registers.c +++ b/gdb/python/py-registers.c @@ -22,7 +22,7 @@ #include "reggroups.h" #include "python-internal.h" #include "user-regs.h" -#include +#include "gdbsupport/unordered_map.h" /* Per-gdbarch data type. */ typedef std::vector> gdbpy_register_type; @@ -98,7 +98,7 @@ gdbpy_get_reggroup (const reggroup *reggroup) /* Map from GDB's internal reggroup objects to the Python representation. GDB's reggroups are global, and are never deleted, so using a map like this is safe. */ - static std::unordered_map> + static gdb::unordered_map> gdbpy_reggroup_object_map; /* If there is not already a suitable Python object in the map then From patchwork Tue Mar 18 02:15:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108267 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 610B63858415 for ; Tue, 18 Mar 2025 02:24:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 610B63858415 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=oTg/55W5 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 1B3163857C5D for ; Tue, 18 Mar 2025 02:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B3163857C5D 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 1B3163857C5D 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=1742264106; cv=none; b=Xo5Us+YaUobLeXNuNy1iJe9NMrHTI1W2STvQmqshnRTa/m/Abq+b5yLH2xwuYVkeX5Xxp4on33e3+nYMwHr0visYuVvD0cdPxNekG/0olOAd3YltVU3NIybULNo/Iy9t7sfvx9/rAtVvR5aY2GqbbulOlP+fBTAv1EezZKrhwl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; c=relaxed/simple; bh=8bprwSAAN2cFqielwKk+uTu+vwlsjjvOQ8upuM51ixg=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=ZkiNIltKx7ovTVitkpnDAG6CA/G9HvUrvtLldHJcHzdEnHdMvyN0KDQASa+ivVTLtJshdNBL2dUPtFvjx9mqjWBDRjL6byR6PpMYGjhznRz2h6ltIzrakGvfTffADBmseUFj2bw7YOpT+kQV4+Pp0AcvUWEvGhon0kiRJzyM0jQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B3163857C5D Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id uMAxtTh40METluMTxteynO; Tue, 18 Mar 2025 02:15:05 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTwtNDPt9ZRbuMTwtkIZ8; Tue, 18 Mar 2025 02:15:04 +0000 X-Authority-Analysis: v=2.4 cv=SL1EVvvH c=1 sm=1 tr=0 ts=67d8d728 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=ytvENQV2Swvj4FQrtRIA: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=WJjCaNAbPCMVCUSusT09MSolGuAizmZbZCJ/XeLsXdw=; b=oTg/55W5QQ4izP56MYNBQAsHqr E0qYpWnQfzaCgTlO+nQlfFOMw7U1apXVWahX7ZHWaO3KUCGxlHPuznINM7jmrCCKKUCaf4KjkpqUP wOAUfS6AvI88quA4Y+XbPJYAP; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTv-00000002cIx-2OOQ; Mon, 17 Mar 2025 20:15:03 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:06 -0600 Subject: [PATCH 13/19] Use gdb unordered map in ravenscar.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-13-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTv-00000002cIx-2OOQ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 14 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfFT9mi/p+1n+TpCXC3OrE3bZ0PfO9cBo7CIisBQAEuelvPciNE4gZzZ8+WQL5a/Fk7g2QeSxmcnA/H8LNfuEd46fqVQ84ZhjL7dteBEwNTw5n/O9sKPP vct71KBqkeirrnrhRhC0nE0ZYFtO7Q6NPjuZ7tPSGRhU/PVkF/sQQ8WjCzCiGGHqzgjKlOhnH1A/30/yIcYdtd0aUB0fEtJ9mxc= X-Spam-Status: No, score=-3017.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, 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 ravenscar.c to use gdb::unordered_map. --- gdb/ravenscar-thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c index 47db72b2d6902265ea8d2a254b8080a41f33aa8a..dae69175efcef1ad777cd871c0ba91a0aab50c2e 100644 --- a/gdb/ravenscar-thread.c +++ b/gdb/ravenscar-thread.c @@ -30,7 +30,7 @@ #include "top.h" #include "regcache.h" #include "objfiles.h" -#include +#include "gdbsupport/unordered_map.h" /* This module provides support for "Ravenscar" tasks (Ada) when debugging on bare-metal targets. @@ -194,7 +194,7 @@ struct ravenscar_thread_target final : public target_ops needed because sometimes the runtime will report an active task that hasn't yet been put on the list of tasks that is read by ada-tasks.c. */ - std::unordered_map m_cpu_map; + gdb::unordered_map m_cpu_map; }; /* Return true iff PTID corresponds to a ravenscar task. */ From patchwork Tue Mar 18 02:15:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108268 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 50EB83858CDB for ; Tue, 18 Mar 2025 02:25:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50EB83858CDB 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=c3zvH43P X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id B01223858031 for ; Tue, 18 Mar 2025 02:15:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B01223858031 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 B01223858031 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264105; cv=none; b=SpNIGdrZK8KF/fFXucg793ZnsOlxw7lZ5vQROpktCbUZTzXnFEMpk5cozwq3TtKQfudTcNYD+/YmdUSg1Sf0vfmfJ7iWPm/LHEuh1/zsVWmA9jhJsg3B1rKGMvQ7BVb1YeVXoyOhkz13EEGwVm4hqw1bQgD3AXZveH3ufIbVBFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264105; c=relaxed/simple; bh=FM9AmZPYBQzPej5AAG5AaM03Bhq8sTNP56g40200u9c=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mY2W1HkFyac3SpCfnp+3cctzPtOhX9ILVAqsHblRK+vSxEGsZ6mozQPS1VRjsmBsXNtiRY+GbR/y85TtHEr0b8EBCknMIy58LOTqPNmePUyI2pcTTNQ8ufzCVZEcJx2zWlnw0VpgCXPpnqRVJax1NdDdTsoPThEcCTxKF31pJjQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B01223858031 Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id uHaWt3SSQXshwuMTxtTyeI; Tue, 18 Mar 2025 02:15:05 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTwtk158sjpEuMTwtpgBd; Tue, 18 Mar 2025 02:15:04 +0000 X-Authority-Analysis: v=2.4 cv=KsFL23WN c=1 sm=1 tr=0 ts=67d8d728 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=oHSMt9IviZhSsT9fonsA: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=lv1vkF08yuXOnhWnmm3ZI5rh75MvRjfJdUph8JEyeFE=; b=c3zvH43PiNFeADN38i6/908hQ4 JN1eLNzLs9U+p1WRISEoMk7Dk4Y5ov5m1mmI/zzDVh3uTd5jyYZRd5nuQdmqnHxWKAjhmjQLfjCA9 8Ulr0sYi/00iI45Rs5lcY6gq+; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTv-00000002cIx-43x0; Mon, 17 Mar 2025 20:15:04 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:07 -0600 Subject: [PATCH 14/19] Use gdb unordered map in target.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-14-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTv-00000002cIx-43x0 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 15 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfA7vZCdNvWVj3G3vMk8EwgJRIP2LGRZHmJJiOKjSwfTdq+BArYy+WxSlsLg64c64V/66k8nYOryzZkRgsN7fSNIAXwvqX3V/G8KIb35LrSwxewg2rOwV CSyOBMRy4uSUE5dw7vTOmESHAOJo3vR3o7/98lliS1RyCH45bg3cxjuNdWLwsHUH8NQrGTyi4HMUy0XmOCeiGhqp/+ZykDD0de0= X-Spam-Status: No, score=-3017.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 corelow.c to use gdb::unordered_map. --- gdb/target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/target.c b/gdb/target.c index b6d1abe82dbfd93df601c599fc03d744d9094d00..8d7f168db84b94de902dffe9dde2ced57e47cefa 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -50,7 +50,7 @@ #include "gdbsupport/byte-vector.h" #include "gdbsupport/search.h" #include "terminal.h" -#include +#include "gdbsupport/unordered_map.h" #include "target-connection.h" #include "valprint.h" #include "cli/cli-decode.h" @@ -72,7 +72,7 @@ static int default_verify_memory (struct target_ops *self, TARGET_NAME" command that when invoked calls the factory registered here. The target_info object is associated with the command via the command's context. */ -static std::unordered_map +static gdb::unordered_map target_factories; /* The singleton debug target. */ From patchwork Tue Mar 18 02:15:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108259 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 12A353857C68 for ; Tue, 18 Mar 2025 02:18:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12A353857C68 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=so2JkNgO X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id F05433857C7B for ; Tue, 18 Mar 2025 02:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F05433857C7B 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 F05433857C7B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264107; cv=none; b=HETicOsQ+f6VHLpgpIZ0jG5Fu4IrT0adskx4+sp0V0kBWDyO7eRlY17qYMLy+5fs+pHO/FkfDJ4lSrFHQSLEcu31PVvAnNo7ylXXD2wYz3nOB4k4eCI5Dgz8trJHpbvtHUlmlinmoAU4g+i/2nk7M2incx4m0eHLJsP3rowoJKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264107; c=relaxed/simple; bh=nN/kra+gxGR4czLX06fWO9zCRiV0kUyKKeuouMkYSHo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=enw5b8EAgdCcxC+3geNO9s+/f+SASfh6/ivVDTQkgFL+TTwB5R/PIsdxLQkoxxJ3HZxgDS+Uq6ML3RJW81WAbb0s+FCwQaUWe5k3H2kz9NGXeabU7wDSIAHY8DBfz2A9DEgJRhwLwEx8uPjQNGphF1L0uS0/FS+TVLdKSgbAYNs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F05433857C7B Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id u1e0tt2mhWuHKuMTytoddk; Tue, 18 Mar 2025 02:15:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTwtNDRZ9ZRbuMTxtkIat; Tue, 18 Mar 2025 02:15:05 +0000 X-Authority-Analysis: v=2.4 cv=SL1EVvvH c=1 sm=1 tr=0 ts=67d8d729 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=YLIEnegWkrM1FMaWx2oA: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=AxcBsve9nEyRT9YiV1A841T8okf+bpDw6EiZ0dM4CwU=; b=so2JkNgOC/CA6yTF/9DlAeN/vv 3ygKigjcNT37IaN+c8/8NQp3yt+i0h86Keb80rru3Xp6xFLKKoKUN9R+CTlfz61hTENEP0tHxOfla JPeOzpz3Yg1NTQ9uSYz+jO4hL; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTw-00000002cIx-1lze; Mon, 17 Mar 2025 20:15:04 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:08 -0600 Subject: [PATCH 15/19] Use gdb unordered set and map in unit tests MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-15-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTw-00000002cIx-1lze X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 16 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJcsf3AhkfY64Z5YKHxC7vNcxOXKiG6zCK+gm90qqq8SRBK24DffAHC1oV+csivcDCnQ4Aj8E/O1ZpfLYtOGa5gD0FVRXSEtycMZxGFVbrvD3SI2DgX+ 0UmIVY5MQnFOvDLgmSdGEoRv3f5JbzT+NmrJw5qaRclI6dgLYWF7wUaiyRa55of/m0CavtwjSB0oUBLeuzwRkpPkk6OatjViMJY= X-Spam-Status: No, score=-3017.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_LOTSOFHASH, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 some unit test code to use gdb:unordered_set and gdb::unordered_map. --- gdb/gdbarch-selftests.c | 5 ++--- gdb/unittests/command-def-selftests.c | 5 ++--- gdb/unittests/intrusive_list-selftests.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c index 56ecc381505b4368c20609f597e008b12f0e2f24..27b17d172a60aa75b29041ae7a0ff770d3d4a8fe 100644 --- a/gdb/gdbarch-selftests.c +++ b/gdb/gdbarch-selftests.c @@ -25,8 +25,7 @@ #include "gdbsupport/def-vector.h" #include "gdbarch.h" #include "scoped-mock-context.h" - -#include +#include "gdbsupport/unordered_map.h" namespace selftests { @@ -131,7 +130,7 @@ register_name_test (struct gdbarch *gdbarch) scoped_mock_context mockctx (gdbarch); /* Track the number of times each register name appears. */ - std::map name_counts; + gdb::unordered_map name_counts; const int num_regs = gdbarch_num_cooked_regs (gdbarch); for (auto regnum = 0; regnum < num_regs; regnum++) diff --git a/gdb/unittests/command-def-selftests.c b/gdb/unittests/command-def-selftests.c index cf51f0d275ab799d2f205d46e1c9e6555bd04108..1579511db1960e582de0098b08f2a9ba879161c8 100644 --- a/gdb/unittests/command-def-selftests.c +++ b/gdb/unittests/command-def-selftests.c @@ -20,8 +20,7 @@ #include "cli/cli-cmds.h" #include "cli/cli-decode.h" #include "gdbsupport/selftest.h" - -#include +#include "gdbsupport/unordered_map.h" namespace selftests { @@ -134,7 +133,7 @@ static unsigned int nr_invalid_prefixcmd = 0; /* A map associating a list with the prefix leading to it. */ -static std::map lists; +static gdb::unordered_map lists; /* Store each command list in lists, associated with the prefix to reach it. A list must only be found once. diff --git a/gdb/unittests/intrusive_list-selftests.c b/gdb/unittests/intrusive_list-selftests.c index 0bcfa624ce579f132b59d019828fd060a5e35909..6d624e4954743bea19c20e5cbb6d321b22ca33b7 100644 --- a/gdb/unittests/intrusive_list-selftests.c +++ b/gdb/unittests/intrusive_list-selftests.c @@ -20,7 +20,7 @@ #include "gdbsupport/intrusive_list.h" #include "gdbsupport/owning_intrusive_list.h" #include "gdbsupport/selftest.h" -#include +#include "gdbsupport/unordered_set.h" /* Count of how many item_with_base or item_with_member objects are currently alive. */ @@ -717,7 +717,7 @@ struct intrusive_list_test item_type a ("a"), b ("b"), c ("c"); ListType list; std::vector expected; - std::unordered_set disposer_seen; + gdb::unordered_set disposer_seen; int disposer_calls = 0; list.push_back (a); From patchwork Tue Mar 18 02:15:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108270 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 92AD6385840B for ; Tue, 18 Mar 2025 02:26:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92AD6385840B 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=rd66+2T8 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 749923857C5F for ; Tue, 18 Mar 2025 02:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 749923857C5F 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 749923857C5F 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=1742264106; cv=none; b=vYdmT5jKvqkslau/yQienSP3cYDtJl2v8Nh65x3yXLlFKNp8LdmHgApdtqLT1cWx0IU6nOaksdL528vuu3IQPQHPKlfZEbw7SFZRYSKvqSekjuMM+iVWb3grR6u2oXv1m4fzNed89Wh5VvH/2fxl7Kq91Kst39vtsZy+hLE3RXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; c=relaxed/simple; bh=KvvZ1FdftNFFgApcKUIiQfaokGwV2tr2Aiu5OEkz47s=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Uozum9AfcKdikhTtigD8ThUHOxxq3yN/Z0HawzeupmtzZdHcuA/a9hTDWc7cuBOzn8uTWFfgL2xavYoYzRXOm9AXI4WOkA5aImgf7gcZAj2boaLJRj9gIQUV9nFRe3OaMRfwwCHtD0FIf/mnMz6aGBWabiCviQ6Rb6d8b7Uqvqs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 749923857C5F Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTPS id uHZ6tRUGmzZPauMTyt8tUZ; Tue, 18 Mar 2025 02:15:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTxt46LXRlrsuMTxtlHgi; Tue, 18 Mar 2025 02:15:05 +0000 X-Authority-Analysis: v=2.4 cv=Qamtvdbv c=1 sm=1 tr=0 ts=67d8d729 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=i3uOrdd2Aa7G1ZKYXMkA: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=MBTKpj5VnUWkbJY4+rCZk6Xmn6iBW2SEUOXQnyrDFAM=; b=rd66+2T8qLRr17cx048SE8r5lL WfF92lNyhOMBB2+Y1AvqvspJuy1Vy+zkQzKQa5IR0vKmaAg3LdDt5p5kJjFgCvaQ53fom9dtXRWjQ ojdhWu1q9wd4jrfi6/zZOv6Vm; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTw-00000002cIx-3wn6; Mon, 17 Mar 2025 20:15:04 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:09 -0600 Subject: [PATCH 16/19] Use gdb unordered map in xml-tdesc.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-16-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTw-00000002cIx-3wn6 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 17 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDyU1ZD7E0Eew2QZq4KSv0zx8WYNN2sdEGDkV8lmGLbegVfvcKlfZRoMa0M09cV5cNyjn19c0h5H8luY1MKRJFLUkYnQeq6yVgqcsL9zgWlBgS/n1DNH Nbve6sAQxcp5u7EoJb19EujAaowbEYj3nBWSXBOGeCSKQEvLbFU0cguqv35pkg2MD6eK5kZni6/1FbKv7X1BNWe8jAk1fvWeJ9w= X-Spam-Status: No, score=-3016.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_BL, RCVD_IN_MSPIKE_H5, 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 xml-tdesc.c to use gdb::unordered_map. --- gdb/xml-tdesc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index 436c493d4f914eb71a80bcbc08dc2ddd38c72027..f2db429c720fb59271ca37d2d2354c525d840fe8 100644 --- a/gdb/xml-tdesc.c +++ b/gdb/xml-tdesc.c @@ -25,7 +25,7 @@ #include "xml-tdesc.h" #include "osabi.h" #include "filenames.h" -#include +#include "gdbsupport/unordered_map.h" #include /* Maximum sizes. @@ -64,7 +64,7 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher) then we will create unnecessary duplicate gdbarches. See gdbarch_list_lookup_by_info. */ -static std::unordered_map xml_cache; +static gdb::unordered_map xml_cache; /* Callback data for target description parsing. */ From patchwork Tue Mar 18 02:15:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108273 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 1948A3858404 for ; Tue, 18 Mar 2025 02:28:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1948A3858404 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=pelE7yPt X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id D8E493857C68 for ; Tue, 18 Mar 2025 02:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8E493857C68 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 D8E493857C68 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; cv=none; b=bT7PNDJE/jLITx/TCJJwMmkgPUM90CDaSC8WbIZkFLvQqvyJJaM1emImDyEdYynmmBOuQ+WS+ciPMO9CCYXxiU8p+BDU16u8MGuBPiGG4pllNt0lSmzXeAM7H1zgOuccTQxcR0c8XeSTX9aZlXvll2FKM/4zDFvU7juwPLdaRhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; c=relaxed/simple; bh=fmKFMVvADzLOylswu9neHrDLZ7sdjYLWCQ9R739nMi8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=G+3oucOZCsO615nXMFqL7qQ1gLoICVaqut2UlhWPgkiRLSPNGDH0R1qvUSZfe0iYBliAaXoduaJ9eANU9IC0xWiIsTVsQaMWrE5Bj59R2MxgoCsLfQWglqifnebogGOA5MpQqRbIDCrcI29ygbqkahjI9lEqYVDiH1Voj55Vl58= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8E493857C68 Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id uLQ8taD97iuzSuMTytc7eM; Tue, 18 Mar 2025 02:15:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTxtZtDrSasJuMTytOBVw; Tue, 18 Mar 2025 02:15:06 +0000 X-Authority-Analysis: v=2.4 cv=A4dqPbWG c=1 sm=1 tr=0 ts=67d8d72a a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=IxUmcl3QsLgjY5Up4KYA: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=PfIDLSzJglXwDtMdvwPeF/L+DdHQ09Mhc+LIEHmC3IQ=; b=pelE7yPtxb9R5R94Jg/+TP2uyc s+pGm+vTlqaPJLlYsFfDtT2VJA8y+dn4LQwqeMHqlUUJPeI8Gxnv1jQHDLQGYlCY29YfNlTZi7xIT 4CG+jCrsVbqLRRkqO1ASfwXDh; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTx-00000002cIx-1R5z; Mon, 17 Mar 2025 20:15:05 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:10 -0600 Subject: [PATCH 17/19] Use gdb unordered set and map in cp-namespace.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-17-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTx-00000002cIx-1R5z X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDPWOfwJh6pwZ2wJ2609lcN741Y7eKdB4gZRpOgMbTyhbxO+Q2ppfBS9VvVaDfrpTqRvHBC9jlqVaIibrluvMx7KXxp+O/6be5io9DvVDnFFNlM1Zz4T XB1vhCn0zOagHHT6VKM3puoVOZWu4Su28oqTGQl2hV26VyiXfld7bG+g5wmWelpSWm4i0H40u/2sE6WPh0umj199XGxJHKDVy5o= X-Spam-Status: No, score=-3017.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 cp-namespace.c to use gdb::unordered_map. --- gdb/cp-namespace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index dc018a2ef286cf84a1b5b38f073849043037faf3..1639cdba967090cc604bec97b929ee69e07268a6 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -32,7 +32,7 @@ #include "language.h" #include "namespace.h" #include "inferior.h" -#include +#include "gdbsupport/unordered_map.h" #include #include @@ -352,6 +352,9 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, return sym; } +/* Type used for collecting symbols. Maps names to symbols. */ +using symbol_map = gdb::unordered_map; + /* This version of the function is internal, use the wrapper unless the list of ambiguous symbols is needed. @@ -391,8 +394,7 @@ cp_lookup_symbol_via_imports (const char *scope, const int search_scope_first, const int declaration_only, const int search_parents, - std::map& found_symbols) + symbol_map& found_symbols) { struct block_symbol sym = {}; int len; @@ -509,7 +511,7 @@ cp_lookup_symbol_via_imports (const char *scope, const int declaration_only, const int search_parents) { - std::map found_symbols; + symbol_map found_symbols; cp_lookup_symbol_via_imports(scope, name, block, domain, 0, declaration_only, search_parents, From patchwork Tue Mar 18 02:15:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108276 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 3EACB3858404 for ; Tue, 18 Mar 2025 02:32:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EACB3858404 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=TjRkeffO X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id 27BBC3858D3C for ; Tue, 18 Mar 2025 02:15:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 27BBC3858D3C 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 27BBC3858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264108; cv=none; b=gXHqiO9rNKJNXEsbDoWGiv26vxLvXVxBYydppKLEjkvEzswPPI9qkcyPAW5K77bRgkuHZTgv1Srpj43J73MTORikFl95SgxT1KPZ5sTgpWDxGyzL69qt2pSH33Nzadr3Vv5+UC39Hf/e18AhDV0sWP6ao1JryHBBifkrjRuIH60= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264108; c=relaxed/simple; bh=7k8KOaDhZepFqXvq/rIpEHAARTwQsLGtKPEZnshSnWc=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=bwKOt3c7Mhsxfb0pU3EGvDTZI0T2mUlsRLpnw107D8/14d4VPu26ZTwzxttjLSlnHWiFuT7GSo0aW1wjkQiKJ5nMax8kfVPctOkP+GnsT+yz8jer4AWKduuw3YPRYfEAVpjkaGXYQUuw6uR0iPGiUvj2aqVcxXQymqfO45kEmdQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27BBC3858D3C Received: from eig-obgw-5001a.ext.cloudfilter.net ([10.0.29.139]) by cmsmtp with ESMTPS id u98WtES7Lf1UXuMTzt4Ap8; Tue, 18 Mar 2025 02:15:07 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTyt8IrHRxIGuMTytQRAY; Tue, 18 Mar 2025 02:15:07 +0000 X-Authority-Analysis: v=2.4 cv=N/viFH9B c=1 sm=1 tr=0 ts=67d8d72b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=8kpLEgudV8QKMxLrZmoA: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=qwErJW0Myfv+yw7tV1E73ycqVj0YxSeNrxu7ndoNxhM=; b=TjRkeffOh/6Ll+7kRAeRWZ5z3w JhwzoEPNAbtOdAv5mKtjLPohjbN1H++7/EK44y8hfHvmvC0EVaYIcCheOgCy6Nu7JTeriWMPdysh0 xVFjaV+vbwZqVdup/hfBaRkH4; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTx-00000002cIx-3J8X; Mon, 17 Mar 2025 20:15:05 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:11 -0600 Subject: [PATCH 18/19] Use gdb unordered map in tui-io.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-18-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTx-00000002cIx-3J8X X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 19 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOI5ufc/UY2CQOP/1SvUaFsqoKqSljcOSSPgDiyIp3/F0VweaJ5X6CoXhz917MRDM1Ttr9vhCqtR0Vy0aOeTt2GwWMlx6DY41hO4OTtOCnqSXpQ4s1HP y4lZtnrTdiqcuWM6gpGfPJwwJ0Szpc9tCbxa0EoSbcP1mBSjKyvaX3JQvg+1st8f8RTlNlUTeI4WzE674CcbN4Ydc/3nsHWO24M= X-Spam-Status: No, score=-3017.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, 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 tui.c to use gdb::unordered_map. ui_file_style::color is changed a little as well; operator< is no longer needed, but a simple hash function is added. --- gdb/tui/tui-io.c | 37 ++++++++++++++++++++++++++++++++----- gdb/ui-style.h | 18 ++++-------------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 7013a543ab61f268e06e78ccad52aa5cc8419700..5d012b2e2077c8c8bd710f5694b0fcd7061b23ea 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -42,7 +42,7 @@ #include "gdbsupport/filestuff.h" #include "completer.h" #include "gdb_curses.h" -#include +#include "gdbsupport/unordered_map.h" #include "pager.h" #include "gdbsupport/gdb-checked-static-cast.h" @@ -178,9 +178,25 @@ tui_putc (char c) update_cmdwin_start_line (); } +/* Specialization of std::hash for colors. */ + +namespace std +{ +template<> struct hash +{ + typedef ui_file_style::color argument_type; + typedef std::size_t result_type; + + result_type operator() (const argument_type &color) const noexcept + { + return color.hash (); + } +}; +} + /* This maps colors to their corresponding color index. */ -static std::map color_map; +static gdb::unordered_map color_map; /* This holds a pair of colors and is used to track the mapping between a color pair index and the actual colors. */ @@ -190,16 +206,27 @@ struct color_pair int fg; int bg; - bool operator< (const color_pair &o) const + bool operator== (const color_pair &other) const noexcept + { + return fg == other.fg && bg == other.bg; + } +}; + +struct color_pair_hash +{ + using is_avalanching = void; + + size_t operator() (const color_pair &val) const noexcept { - return fg < o.fg || (fg == o.fg && bg < o.bg); + static_assert (std::has_unique_object_representations_v); + return ankerl::unordered_dense::detail::wyhash::hash (&val, sizeof (val)); } }; /* This maps pairs of colors to their corresponding color pair index. */ -static std::map color_pair_map; +static gdb::unordered_map color_pair_map; /* This is indexed by ANSI color offset from the base color, and holds the corresponding curses color constant. */ diff --git a/gdb/ui-style.h b/gdb/ui-style.h index d814588254143149e5b24a45f3a3cdd8a24c91da..4e994966e27c582335952f58c33887fc7c0b0b86 100644 --- a/gdb/ui-style.h +++ b/gdb/ui-style.h @@ -151,22 +151,12 @@ struct ui_file_style return ! (*this == other); } - bool operator< (const color &other) const + /* Compute a simple hash code for this object. */ + size_t hash () const { - if (m_color_space != other.m_color_space) - return m_color_space < other.m_color_space; if (is_simple ()) - return m_value < other.m_value; - if (m_red < other.m_red) - return true; - if (m_red == other.m_red) - { - if (m_green < other.m_green) - return true; - if (m_green == other.m_green) - return m_blue < other.m_blue; - } - return false; + return m_value; + return (m_red << 16) + (m_green << 8) + m_red; } color_space colorspace () const From patchwork Tue Mar 18 02:15:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108274 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 0E2FA3858415 for ; Tue, 18 Mar 2025 02:30:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E2FA3858415 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=m7zuvfQC X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 749453857BBA for ; Tue, 18 Mar 2025 02:15:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 749453857BBA 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 749453857BBA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264108; cv=none; b=HUo1NYescKYU3MKfBpwpGyyhZoSBMjmvzWqPGzdSSN9HP9Alm0odyMxnAkS91u25UJNKhzoIho1D0WVFi4qedquHe6ajuYQ6BsHk1fSvt/eSq3S8qmnkgwhtceOG765THbmY6NWFmJENfCaEiqZC1XA9EZ/RGG8KiogZUoI+Mj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264108; c=relaxed/simple; bh=GAFmpahi2Q7i8spUwOSWiBqKQ69K0sVJbWKPc1EQGC8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=f7ZgkULsfIr/6ZSB/D2IxsGI3DQkj7w5mBTvffV5mpkXw605ZaxrHtiSS2QtIrjkAl5BXKB7XkDgXL5SJ6aDEJH59gzGiO/qmUX8fTGpjiiNDEdoemtcESNRWel+hFs1Aoh22yyr0Ih0jJjhBezH4/d1mUJw93MVdZcFli1Iu0Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 749453857BBA Received: from eig-obgw-6008a.ext.cloudfilter.net ([10.0.30.227]) by cmsmtp with ESMTPS id uKBftkgkwAfjwuMTztJ8sn; Tue, 18 Mar 2025 02:15:07 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTytVDfMzUYtuMTztDBHz; Tue, 18 Mar 2025 02:15:07 +0000 X-Authority-Analysis: v=2.4 cv=VrElAf2n c=1 sm=1 tr=0 ts=67d8d72b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=MaTtwZ6CATtQbm-9z6EA: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=jjcW/kfe9Hdjboz/giG2mVJw7W5WeZDDD/kg80EPsu8=; b=m7zuvfQCmh2Ka7U3sEHask2CAM 2bN17JhjO7mDr5D7sIHDCAX7FMaSWbyPnzlslY6udBkoDk9vs7copTUT7NeF2iG9RkDwM8B/2C4Ut 9MVxoxi0hf0kQLDNylO7Ck4YJ; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTy-00000002cIx-11Ko; Mon, 17 Mar 2025 20:15:06 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:12 -0600 Subject: [PATCH 19/19] Use gdb unordered map in regcache.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-19-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@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.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTy-00000002cIx-11Ko X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 20 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOqwOcymnUTyTUvPpulRDdr4f93XN0Xt2LgIscNDdTq7GqEYB8ra2+egdRAX5xyhJVH/3K8w8UBf6mywOogB4BkX4v7ObFh2MyHl+9WXp1K7V5iPOIlh ejKVumM/7EUkEiBEylMYfC0uA+gbag2xCYZdLuOrvk2YuoiNY489A+2yl2/gSrYilUrb+laV3u2IhLKNq/UQYxKFeoGO0tnes7U= X-Spam-Status: No, score=-3017.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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 a couple spots in regcache.c to use gdb::unordered_map. --- gdb/regcache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/regcache.c b/gdb/regcache.c index 65e69d25578aa5e7c06a63484ed370bfc4acc955..55087782bacf77fa515206cbae73a45d9ca6de61 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -28,6 +28,7 @@ #include "reggroups.h" #include "observable.h" #include "regset.h" +#include "gdbsupport/unordered_map.h" #include #include "cli/cli-cmds.h" @@ -349,12 +350,12 @@ using ptid_regcache_map /* Type holding regcaches for a given pid. */ -using pid_ptid_regcache_map = std::unordered_map; +using pid_ptid_regcache_map = gdb::unordered_map; /* Type holding regcaches for a given target. */ using target_pid_ptid_regcache_map - = std::unordered_map; + = gdb::unordered_map; /* Global structure containing the existing regcaches. */