diff mbox series

[v4,07/22] Convert breakpoint.c to new hash table

Message ID	20240823184910.883268-8-simon.marchi@efficios.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 103FE3875DF2 From: Simon Marchi <simon.marchi@efficios.com> To: gdb-patches@sourceware.org Cc: Simon Marchi <simon.marchi@efficios.com>, Tom Tromey <tom@tromey.com> Subject: [PATCH v4 07/22] Convert breakpoint.c to new hash table Date: Fri, 23 Aug 2024 14:48:36 -0400 Message-ID: <20240823184910.883268-8-simon.marchi@efficios.com> In-Reply-To: <20240823184910.883268-1-simon.marchi@efficios.com> References: <20240823184910.883268-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org
Series	Add a C++ hash table to gdbsupport \| [v4,00/22] Add a C++ hash table to gdbsupport [v4,01/22] gdbsupport: add unordered_dense.h 4.4.0 [v4,02/22] Convert compile-c-symbols.c to new hash table [v4,03/22] Convert filename-seen-cache.h to new hash table [v4,04/22] Convert linespec.c to new hash table [v4,05/22] Convert target-descriptions.c to new hash table [v4,06/22] Convert dwarf2/macro.c to new hash table [v4,07/22] Convert breakpoint.c to new hash table [v4,08/22] Convert py-framefilter.c to new hash table [v4,09/22] Convert disasm.c to new hash table [v4,10/22] Convert compile/compile.c to new hash table [v4,11/22] Convert type copying to new hash table [v4,12/22] Convert static links to new hash table [v4,13/22] Convert gnu-v3-abi.c to new hash table [v4,14/22] Convert abbrev cache to new hash table [v4,15/22] Convert abbrevs to new hash table [v4,16/22] Convert typedef hash to new hash table [v4,17/22] Convert all_bfds to new hash table [v4,18/22] Convert more DWARF code to new hash table [v4,19/22] Convert gdb_bfd.c to new hash table [v4,20/22] Convert dwarf_cu::die_hash to new hash table [v4,21/22] Convert dwarf2_cu::call_site_htab to new hash table [v4,22/22] Convert dwarf2_per_objfile::die_type_hash to new hash table

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

Simon Marchi Aug. 23, 2024, 6:48 p.m. UTC

  This converts breakpoint.c to use the new hash table.

Change-Id: I6d997a6242969586a7f8f9eb22cc8dd8d3ac97ff
Co-Authored-By: Tom Tromey <tom@tromey.com>
---
 gdb/breakpoint.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 17bd627f867c..e04aec86ca09 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -21,7 +21,7 @@ 
 #include <ctype.h>
 #include "event-top.h"
 #include "exceptions.h"
-#include "hashtab.h"
+#include "gdbsupport/unordered_set.h"
 #include "symtab.h"
 #include "frame.h"
 #include "breakpoint.h"
@@ -12749,25 +12749,20 @@  all_locations_are_pending (struct breakpoint *b, struct program_space *pspace)
 static bool
 ambiguous_names_p (const bp_location_range &locs)
 {
-  htab_up htab (htab_create_alloc (13, htab_hash_string, htab_eq_string, NULL,
-				   xcalloc, xfree));
+  gdb::unordered_set<std::string_view> htab;
 
   for (const bp_location &l : locs)
     {
-      const char **slot;
       const char *name = l.function_name.get ();
 
       /* Allow for some names to be NULL, ignore them.  */
       if (name == NULL)
 	continue;
 
-      slot = (const char **) htab_find_slot (htab.get (), (const void *) name,
-					     INSERT);
-      /* NOTE: We can assume slot != NULL here because xcalloc never
-	 returns NULL.  */
-      if (*slot != NULL)
+      bool inserted = htab.insert (name).second;
+
+      if (!inserted)
 	return true;
-      *slot = name;
     }
 
   return false;