From aa78b3b28aeff4bb9977a313f5a8002d920b34c5 Mon Sep 17 00:00:00 2001
From: Patrick Palka <patrick@parcs.ath.cx>
Date: Mon, 29 Jun 2015 10:45:47 -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:

	* gdbarch.h (gdbarch_obstack_strdup): Declare.
	* gdbarch.c (gdbarch_obstack_strdup): Define.
	* gdbtypes.c (arch_type): Use it.
---
 gdb/ChangeLog  |  6 ++++++
 gdb/gdbarch.c  | 10 ++++++++++
 gdb/gdbarch.h  |  5 +++++
 gdb/gdbtypes.c |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e727bfb7b7..4b476c2d38 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-29  Patrick Palka  <patrick@parcs.ath.cx>
+
+	* gdbarch.h (gdbarch_obstack_strdup): Declare.
+	* gdbarch.c (gdbarch_obstack_strdup): Define.
+	* gdbtypes.c (arch_type): Use it.
+
 2015-08-29  Patrick Palka  <patrick@parcs.ath.cx>
 
 	* gdbtypes.c (alloc_type_arch): Allocate the type on the given
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 0d4142b94a..37ce22a1e1 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -449,6 +449,16 @@ gdbarch_obstack_zalloc (struct gdbarch *arch, long size)
   return data;
 }
 
+/* See gdbarch.h.  */
+
+char *
+gdbarch_obstack_strdup (struct gdbarch *gdbarch, const char *string)
+{
+  char *obstring = gdbarch_obstack_zalloc (gdbarch, strlen (string) + 1);
+  strcpy (obstring, string);
+  return obstring;
+}
+
 
 /* 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..75503794a6 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 *gdbarch, const char *string);
 
 /* Helper function.  Force an update of the current architecture.
 
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8204d39d18..a81258dfc8 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;
 }