diff mbox series

[07/19] Convert breakpoint.c to new hash table

Message ID	20230407-t-robin-hood-hash-v1-7-900d93ef1510@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 502123858C1F From: Tom Tromey <tom@tromey.com> Date: Fri, 07 Apr 2023 09:25:39 -0600 Subject: [PATCH 07/19] Convert breakpoint.c to new hash table MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230407-t-robin-hood-hash-v1-7-900d93ef1510@tromey.com> References: <20230407-t-robin-hood-hash-v1-0-900d93ef1510@tromey.com> In-Reply-To: <20230407-t-robin-hood-hash-v1-0-900d93ef1510@tromey.com> To: gdb-patches@sourceware.org Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Add hash table to gdbsupport \| [00/19] Add hash table to gdbsupport [01/19] Add a hash table to gdbsupport [02/19] Convert compile-c-symbols.c to new hash table [03/19] Convert filename-seen-cache.h to new hash table [04/19] Convert linespec.c to new hash table [05/19] Convert target-descriptions.c to new hash table [06/19] Convert dwarf2/macro.c to new hash table [07/19] Convert breakpoint.c to new hash table [08/19] Convert py-framefilter.c to new hash table [09/19] Convert disasm.c to new hash table [10/19] Convert compile/compile.c to new hash table [11/19] Convert type copying to new hash table [12/19] Convert static links to new hash table [13/19] Convert gnu-v3-abi.c to new hash table [14/19] Convert abbrev cache to new hash table [15/19] Convert abbrevs to new hash table [16/19] Convert typedef hash to new hash table [17/19] Convert all_bfds to new hash table [18/19] Convert more DWARF code to new hash table [19/19] Convert gdb_bfd.c to new hash table

Commit Message

Tom Tromey April 7, 2023, 3:25 p.m. UTC

  This converts breakpoint.c to use the new hash table.
---
 gdb/breakpoint.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ebe97940f54..3e380a1fd0b 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -20,7 +20,6 @@ 
 #include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
-#include "hashtab.h"
 #include "symtab.h"
 #include "frame.h"
 #include "breakpoint.h"
@@ -81,6 +80,7 @@ 
 #include "progspace-and-thread.h"
 #include "gdbsupport/array-view.h"
 #include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/hash-table.h"
 
 /* Prototypes for local functions.  */
 
@@ -12489,25 +12489,21 @@  static bool
 ambiguous_names_p (struct bp_location *loc)
 {
   struct bp_location *l;
-  htab_up htab (htab_create_alloc (13, htab_hash_string, htab_eq_string, NULL,
-				   xcalloc, xfree));
+
+  using traits = gdb::libiberty_traits<htab_hash_string, htab_eq_string,
+				       const char *>;
+  gdb::traited_hash_table<traits> htab;
 
   for (l = loc; l != NULL; l = l->next)
     {
-      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)
+      if (!htab.insert (name).second)
 	return true;
-      *slot = name;
     }
 
   return false;