From 6c214e7cb397bf0de539fec640e764f0131e9677 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sat, 29 Aug 2015 18:07:50 -0400 Subject: [PATCH] Use gdbarch obstack to allocate the TYPE_NAME string in arch_type Since the type whose name is being set is now being allocated on the gdbarch obstack, we should allocate its TYPE_NAME on the obstack too. This reduces the number of individual valgrind warnings for the command "gdb gdb" from ~300 to ~150. Tested on x86_64-unknown-linux-gnu. gdb/ChangeLog: * gdb_obstack.h (obstack_strdup): Declare. * gdb_obstack.c (obstack_strdup): Define. * gdbarch.sh (gdbarch_obstack_strdup): Declare and define. * gdbarch.c: Regenerate. * gdbarch.h: Regenerate. * gdbtypes.c (arch_type): Use gdbarch_obstack_strdup. --- gdb/ChangeLog | 9 +++++++++ gdb/gdb_obstack.c | 10 ++++++++++ gdb/gdb_obstack.h | 5 +++++ gdb/gdbarch.c | 8 ++++++++ gdb/gdbarch.h | 5 +++++ gdb/gdbarch.sh | 13 +++++++++++++ gdb/gdbtypes.c | 2 +- 7 files changed, 51 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 11997e6c1b..f8b68747bd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-09-02 Patrick Palka + + * gdb_obstack.h (obstack_strdup): Declare. + * gdb_obstack.c (obstack_strdup): Define. + * gdbarch.sh (gdbarch_obstack_strdup): Declare and define. + * gdbarch.c: Regenerate. + * gdbarch.h: Regenerate. + * gdbtypes.c (arch_type): Use gdbarch_obstack_strdup. + 2015-09-02 Patrick Palka * gdbtypes.c (copy_type_recursive): Update documentation. diff --git a/gdb/gdb_obstack.c b/gdb/gdb_obstack.c index b972eabeb9..d8d03df060 100644 --- a/gdb/gdb_obstack.c +++ b/gdb/gdb_obstack.c @@ -45,3 +45,13 @@ obconcat (struct obstack *obstackp, ...) return obstack_finish (obstackp); } + +/* See gdb_obstack.h. */ + +char * +obstack_strdup (struct obstack *obstackp, const char *string) +{ + char *obstring = obstack_alloc (obstackp, strlen (string) + 1); + strcpy (obstring, string); + return obstring; +} diff --git a/gdb/gdb_obstack.h b/gdb/gdb_obstack.h index 826c8b2a2a..3272721154 100644 --- a/gdb/gdb_obstack.h +++ b/gdb/gdb_obstack.h @@ -58,4 +58,9 @@ extern char *obconcat (struct obstack *obstackp, ...) ATTRIBUTE_SENTINEL; +/* Duplicate STRING, returning an equivalent string that's allocated on the + obstack OBSTACKP. */ + +extern char *obstack_strdup (struct obstack *obstackp, const char *string); + #endif diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 0d4142b94a..f04eef99e0 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -449,6 +449,14 @@ gdbarch_obstack_zalloc (struct gdbarch *arch, long size) return data; } +/* See gdbarch.h. */ + +char * +gdbarch_obstack_strdup (struct gdbarch *arch, const char *string) +{ + return obstack_strdup (arch->obstack, string); +} + /* Free a gdbarch struct. This should never happen in normal operation --- once you've created a gdbarch, you keep it around. diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 7df37c9e16..82e025956b 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1618,6 +1618,11 @@ extern void *gdbarch_obstack_zalloc (struct gdbarch *gdbarch, long size); #define GDBARCH_OBSTACK_CALLOC(GDBARCH, NR, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), (NR) * sizeof (TYPE))) #define GDBARCH_OBSTACK_ZALLOC(GDBARCH, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), sizeof (TYPE))) +/* Duplicate STRING, returning an equivalent string that's allocated on the + obstack associated with GDBARCH. The string is freed when the corresponding + architecture is also freed. */ + +extern char *gdbarch_obstack_strdup (struct gdbarch *arch, const char *string); /* Helper function. Force an update of the current architecture. diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 34e6a74a2e..388920fd1b 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1486,6 +1486,11 @@ extern void *gdbarch_obstack_zalloc (struct gdbarch *gdbarch, long size); #define GDBARCH_OBSTACK_CALLOC(GDBARCH, NR, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), (NR) * sizeof (TYPE))) #define GDBARCH_OBSTACK_ZALLOC(GDBARCH, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), sizeof (TYPE))) +/* Duplicate STRING, returning an equivalent string that's allocated on the + obstack associated with GDBARCH. The string is freed when the corresponding + architecture is also freed. */ + +extern char *gdbarch_obstack_strdup (struct gdbarch *arch, const char *string); /* Helper function. Force an update of the current architecture. @@ -1791,6 +1796,14 @@ gdbarch_obstack_zalloc (struct gdbarch *arch, long size) return data; } +/* See gdbarch.h. */ + +char * +gdbarch_obstack_strdup (struct gdbarch *arch, const char *string) +{ + return obstack_strdup (arch->obstack, string); +} + /* Free a gdbarch struct. This should never happen in normal operation --- once you've created a gdbarch, you keep it around. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 7a18bed04f..12ff014ea6 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4549,7 +4549,7 @@ arch_type (struct gdbarch *gdbarch, TYPE_LENGTH (type) = length; if (name) - TYPE_NAME (type) = xstrdup (name); + TYPE_NAME (type) = gdbarch_obstack_strdup (gdbarch, name); return type; } -- 2.34.1