From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 70EC13858432; Mon, 24 Jun 2024 15:28:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70EC13858432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1719242927; bh=ZPVD2O5Q1xY5DRaheYzWyfFhrqPCNjRpOxzL0fhMUd8=; h=From:To:Subject:Date:From; b=onk6jVRw03xfQxVm3jt4YVpbBDu5NpWuOiKv9crEvwFjm5vNjotNF64F8ksZ+GgtX Pc8S39jSW/nXvxMYakrqkUJQ7KU11wTU9IVxC4uaTBawXKHKtZZeXoqqd6DAu6xLlO yYbEFSiPvoiUudFsgDnAQ2CO1wkyoJl15nCs/ykk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove hashtab_obstack_allocate X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 4122e647d571b35b4aba73ec481bc2d72d193e54 X-Git-Newrev: 9f71296fda412c315a8dde05b51d5163e3e2e53c Message-Id: <20240624152847.70EC13858432@sourceware.org> Date: Mon, 24 Jun 2024 15:28:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9f71296fda41= 2c315a8dde05b51d5163e3e2e53c commit 9f71296fda412c315a8dde05b51d5163e3e2e53c Author: Tom Tromey Date: Wed Jun 5 09:51:08 2024 -0600 Remove hashtab_obstack_allocate =20 I think that hashtabs should never be obstack-allocated. In the past this was convenient sometimes, because any new data structure needed a corresponding cleanup. However, with the switch to C++, resource management has become much simpler; for example, a local variable can simply be of type htab_up rather than hashtab_t, and the problem is solved. =20 This patch removes hashtab_obstack_allocate to try to prevent this anti-pattern from being used again. Diff: --- gdbsupport/Makefile.am | 1 - gdbsupport/Makefile.in | 5 +---- gdbsupport/gdb-hashtab.cc | 43 ------------------------------------------- gdbsupport/gdb-hashtab.h | 5 ----- 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am index 2b0f987125c..36e561e015d 100644 --- a/gdbsupport/Makefile.am +++ b/gdbsupport/Makefile.am @@ -68,7 +68,6 @@ libgdbsupport_a_SOURCES =3D \ filestuff.cc \ format.cc \ gdb-dlfcn.cc \ - gdb-hashtab.cc \ gdb_obstack.cc \ gdb_regex.cc \ gdb_tilde_expand.cc \ diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index ee709112aae..9cff86bd987 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -159,8 +159,7 @@ am_libgdbsupport_a_OBJECTS =3D agent.$(OBJEXT) btrace-c= ommon.$(OBJEXT) \ common-regcache.$(OBJEXT) common-utils.$(OBJEXT) \ environ.$(OBJEXT) errors.$(OBJEXT) event-loop.$(OBJEXT) \ fileio.$(OBJEXT) filestuff.$(OBJEXT) format.$(OBJEXT) \ - gdb-dlfcn.$(OBJEXT) gdb-hashtab.$(OBJEXT) \ - gdb_obstack.$(OBJEXT) gdb_regex.$(OBJEXT) \ + gdb-dlfcn.$(OBJEXT) gdb_obstack.$(OBJEXT) gdb_regex.$(OBJEXT) \ gdb_tilde_expand.$(OBJEXT) gdb_wait.$(OBJEXT) \ gdb_vecs.$(OBJEXT) job-control.$(OBJEXT) netstuff.$(OBJEXT) \ new-op.$(OBJEXT) pathstuff.$(OBJEXT) print-utils.$(OBJEXT) \ @@ -426,7 +425,6 @@ libgdbsupport_a_SOURCES =3D \ filestuff.cc \ format.cc \ gdb-dlfcn.cc \ - gdb-hashtab.cc \ gdb_obstack.cc \ gdb_regex.cc \ gdb_tilde_expand.cc \ @@ -536,7 +534,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filestuff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb-dlfcn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb-hashtab.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb_obstack.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb_regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb_tilde_expand.Po@am__q= uote@ diff --git a/gdbsupport/gdb-hashtab.cc b/gdbsupport/gdb-hashtab.cc deleted file mode 100644 index 42f80faa403..00000000000 --- a/gdbsupport/gdb-hashtab.cc +++ /dev/null @@ -1,43 +0,0 @@ -/* Hash table wrappers for gdb. - Copyright (C) 2021-2024 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . = */ - -#include "gdb-hashtab.h" - -/* Allocation function for the libiberty hash table which uses an - obstack. The obstack is passed as DATA. */ - -void * -hashtab_obstack_allocate (void *data, size_t size, size_t count) -{ - size_t total =3D size * count; - void *ptr =3D obstack_alloc ((struct obstack *) data, total); - - memset (ptr, 0, total); - return ptr; -} - -/* Trivial deallocation function for the libiberty splay tree and hash - table - don't deallocate anything. Rely on later deletion of the - obstack. DATA will be the obstack, although it is not needed - here. */ - -void -dummy_obstack_deallocate (void *object, void *data) -{ - return; -} diff --git a/gdbsupport/gdb-hashtab.h b/gdbsupport/gdb-hashtab.h index 0cdcc840425..05465f9a81f 100644 --- a/gdbsupport/gdb-hashtab.h +++ b/gdbsupport/gdb-hashtab.h @@ -42,9 +42,4 @@ htab_delete_entry (void *ptr) delete (T *) ptr; } =20 -/* Allocation and deallocation functions for the libiberty hash table - which use obstacks. */ -void *hashtab_obstack_allocate (void *data, size_t size, size_t count); -void dummy_obstack_deallocate (void *object, void *data); - #endif /* GDBSUPPORT_GDB_HASHTAB_H */