This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Add psymtab_storage::allocate_dependencies
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 10 Jan 2019 14:13:12 -0000
- Subject: [binutils-gdb] Add psymtab_storage::allocate_dependencies
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a9342b62885d5119593fa4330924e031e14c6406
commit a9342b62885d5119593fa4330924e031e14c6406
Author: Tom Tromey <tom@tromey.com>
Date: Thu May 10 16:23:55 2018 -0600
Add psymtab_storage::allocate_dependencies
This adds a new method to psymtab_storage to allocate storage for
psymtab dependencies, then changes the symbol readers to use it. This
has the effect of moving the storage to the psymtab storage obstack.
gdb/ChangeLog
2019-01-10 Tom Tromey <tom@tromey.com>
* xcoffread.c (xcoff_end_psymtab): Use allocate_dependencies.
* psymtab.h (psymtab_storage::allocate_dependencies): New method.
* mdebugread.c (parse_partial_symbols): Use
allocate_dependencies.
* dwarf2read.c (dwarf2_create_include_psymtab): Use
allocate_dependencies.
(process_psymtab_comp_unit_reader)
(build_type_psymtab_dependencies): Likewise.
* dbxread.c (dbx_end_psymtab): Use allocate_dependencies.
Diff:
---
gdb/ChangeLog | 12 ++++++++++++
gdb/dbxread.c | 7 +++----
gdb/dwarf2read.c | 10 ++++------
gdb/mdebugread.c | 4 ++--
gdb/psymtab.h | 9 +++++++++
gdb/xcoffread.c | 7 +++----
6 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84797bb..5b7551b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
2019-01-10 Tom Tromey <tom@tromey.com>
+ * xcoffread.c (xcoff_end_psymtab): Use allocate_dependencies.
+ * psymtab.h (psymtab_storage::allocate_dependencies): New method.
+ * mdebugread.c (parse_partial_symbols): Use
+ allocate_dependencies.
+ * dwarf2read.c (dwarf2_create_include_psymtab): Use
+ allocate_dependencies.
+ (process_psymtab_comp_unit_reader)
+ (build_type_psymtab_dependencies): Likewise.
+ * dbxread.c (dbx_end_psymtab): Use allocate_dependencies.
+
+2019-01-10 Tom Tromey <tom@tromey.com>
+
* psymtab.c (add_psymbol_to_bcache): Pass psymtab obstack to
PSYMBOL_SET_LANGUAGE.
(allocate_psymtab): Allocate psymtab on the psymtab obstack.
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 6149175..25bcc27 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2023,9 +2023,8 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst,
pst->number_of_dependencies = number_dependencies;
if (number_dependencies)
{
- pst->dependencies = XOBNEWVEC (&objfile->objfile_obstack,
- struct partial_symtab *,
- number_dependencies);
+ pst->dependencies
+ = objfile->partial_symtabs->allocate_dependencies (number_dependencies);
memcpy (pst->dependencies, dependency_list,
number_dependencies * sizeof (struct partial_symtab *));
}
@@ -2045,7 +2044,7 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst,
/* We could save slight bits of space by only making one of these,
shared by the entire set of include files. FIXME-someday. */
subpst->dependencies =
- XOBNEW (&objfile->objfile_obstack, struct partial_symtab *);
+ objfile->partial_symtabs->allocate_dependencies (1);
subpst->dependencies[0] = pst;
subpst->number_of_dependencies = 1;
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 97ca341..7546c48 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6585,8 +6585,7 @@ dwarf2_create_include_psymtab (const char *name, struct partial_symtab *pst,
subpst->dirname = pst->dirname;
}
- subpst->dependencies
- = XOBNEW (&objfile->objfile_obstack, struct partial_symtab *);
+ subpst->dependencies = objfile->partial_symtabs->allocate_dependencies (1);
subpst->dependencies[0] = pst;
subpst->number_of_dependencies = 1;
@@ -8061,8 +8060,8 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
/* Fill in 'dependencies' here; we fill in 'users' in a
post-pass. */
pst->number_of_dependencies = len;
- pst->dependencies =
- XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
+ pst->dependencies
+ = objfile->partial_symtabs->allocate_dependencies (len);
for (i = 0;
VEC_iterate (dwarf2_per_cu_ptr, cu->per_cu->imported_symtabs,
i, iter);
@@ -8315,8 +8314,7 @@ build_type_psymtab_dependencies (void **slot, void *info)
gdb_assert (IS_TYPE_UNIT_GROUP (per_cu));
pst->number_of_dependencies = len;
- pst->dependencies =
- XOBNEWVEC (&objfile->objfile_obstack, struct partial_symtab *, len);
+ pst->dependencies = objfile->partial_symtabs->allocate_dependencies (len);
for (i = 0;
VEC_iterate (sig_type_ptr, tu_group->tus, i, iter);
++i)
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 7e09800..150cd16 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -3709,8 +3709,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
/* Skip the first file indirect entry as it is a self dependency for
source files or a reverse .h -> .c dependency for header files. */
pst->number_of_dependencies = 0;
- pst->dependencies = XOBNEWVEC (&objfile->objfile_obstack,
- partial_symtab *, (fh->crfd - 1));
+ pst->dependencies
+ = objfile->partial_symtabs->allocate_dependencies (fh->crfd - 1);
for (s_idx = 1; s_idx < fh->crfd; s_idx++)
{
RFDT rh;
diff --git a/gdb/psymtab.h b/gdb/psymtab.h
index d0e5969..57570e3 100644
--- a/gdb/psymtab.h
+++ b/gdb/psymtab.h
@@ -20,6 +20,7 @@
#ifndef PSYMTAB_H
#define PSYMTAB_H
+#include "gdb_obstack.h"
#include "symfile.h"
#include "common/next-iterator.h"
@@ -62,6 +63,14 @@ public:
return m_obstack;
}
+ /* Allocate storage for the "dependencies" field of a psymtab.
+ NUMBER says how many dependencies there are. */
+
+ struct partial_symtab **allocate_dependencies (int number)
+ {
+ return OBSTACK_CALLOC (obstack (), number, struct partial_symtab *);
+ }
+
/* Each objfile points to a linked list of partial symtabs derived from
this file, one partial symtab structure for each compilation unit
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 50da078..e93a34b 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -2075,9 +2075,8 @@ xcoff_end_psymtab (struct objfile *objfile, struct partial_symtab *pst,
pst->number_of_dependencies = number_dependencies;
if (number_dependencies)
{
- pst->dependencies = XOBNEWVEC (&objfile->objfile_obstack,
- struct partial_symtab *,
- number_dependencies);
+ pst->dependencies
+ = objfile->partial_symtabs->allocate_dependencies (number_dependencies);
memcpy (pst->dependencies, dependency_list,
number_dependencies * sizeof (struct partial_symtab *));
}
@@ -2096,7 +2095,7 @@ xcoff_end_psymtab (struct objfile *objfile, struct partial_symtab *pst,
/* We could save slight bits of space by only making one of these,
shared by the entire set of include files. FIXME-someday. */
subpst->dependencies =
- XOBNEW (&objfile->objfile_obstack, struct partial_symtab *);
+ objfile->partial_symtabs->allocate_dependencies (1);
subpst->dependencies[0] = pst;
subpst->number_of_dependencies = 1;