diff mbox series

[15/19] Use gdb unordered set and map in unit tests

Message ID	20250317-replace-std-stuff-v1-15-7ba4ee88e218@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F05433857C7B From: Tom Tromey <tom@tromey.com> 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 <tom@tromey.com> Precedence: list Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org
Series	Convert std::unordered_{set,map} to gdb implementations \| [00/19] Convert std::unordered_{set,map} to gdb implementations [01/19] Use gdb unordered set and map in corelow.c [02/19] Use gdb unordered set in breakpoint.c [03/19] Use gdb unordered map in dictionary.c [04/19] Use gdb unordered map in gdb_bfd.c [05/19] Use gdb unordered set in symtab.c [06/19] Use gdb unordered map in ada-exp.y [07/19] Use gdb unordered map in inferior.h [08/19] Use gdb unordered map in stap-probe.c [09/19] Use gdb unordered map for complaints [10/19] Use gdb unordered map in linux-nat.c [11/19] Use gdb unordered set in linux-procfs.c [12/19] Use gdb unordered set and map in Python layer [13/19] Use gdb unordered map in ravenscar.c [14/19] Use gdb unordered map in target.c [15/19] Use gdb unordered set and map in unit tests [16/19] Use gdb unordered map in xml-tdesc.c [17/19] Use gdb unordered set and map in cp-namespace.c [18/19] Use gdb unordered map in tui-io.c [19/19] Use gdb unordered map in regcache.c

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64	fail	Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-arm	fail	Patch failed to apply

Commit Message

Tom Tromey March 18, 2025, 2:15 a.m. UTC

  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 mbox series

Patch

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 <map>
+#include "gdbsupport/unordered_map.h"
 
 namespace selftests {
 
@@ -131,7 +130,7 @@  register_name_test (struct gdbarch *gdbarch)
   scoped_mock_context<test_target_ops> mockctx (gdbarch);
 
   /* Track the number of times each register name appears.  */
-  std::map<const std::string, int> name_counts;
+  gdb::unordered_map<std::string, int> 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 <map>
+#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<cmd_list_element **, const char *> lists;
+static gdb::unordered_map<cmd_list_element **, const char *> 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 <unordered_set>
+#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<const item_type *> expected;
-    std::unordered_set<const item_type *> disposer_seen;
+    gdb::unordered_set<const item_type *> disposer_seen;
     int disposer_calls = 0;
 
     list.push_back (a);