From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GO/gCPjX2GfGYhMAWB0awg (envelope-from ) for ; Mon, 17 Mar 2025 22:18:32 -0400 Authentication-Results: simark.ca; 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; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1E5E81E100; Mon, 17 Mar 2025 22:18:32 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AE90D1E05C for ; Mon, 17 Mar 2025 22:18:31 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 33A6F3858CDA for ; Tue, 18 Mar 2025 02:18:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33A6F3858CDA 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 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org 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); -- 2.46.1