From 0e6f30610fdb50b4974b349ed3673b744d03e9a9 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Tue, 22 May 2018 22:44:44 -0600
Subject: [PATCH] Remove some unused buildsym functions

Now that the DWARF reader uses the builder-based API, we can remove a
few "legacy" functions that were only ever called by it.

gdb/ChangeLog
2018-07-20  Tom Tromey  <tom@tromey.com>

	* buildsym-legacy.h (augment_type_symtab): Don't declare.
	(end_expandable_symtab): Likewise.
	(end_symtab_get_static_block): Likewise.
	(end_symtab_from_static_block): Likewise.
	* buildsym-legacy.c (augment_type_symtab): Remove.
	(end_expandable_symtab): Remove.
	(end_symtab_get_static_block): Remove.
	(end_symtab_from_static_block): Remove.
---
 gdb/ChangeLog         | 11 +++++++++++
 gdb/buildsym-legacy.c | 38 --------------------------------------
 gdb/buildsym-legacy.h | 32 --------------------------------
 3 files changed, 11 insertions(+), 70 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 80d15bd148..9f9b8e3a11 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2018-07-20  Tom Tromey  <tom@tromey.com>
+
+	* buildsym-legacy.h (augment_type_symtab): Don't declare.
+	(end_expandable_symtab): Likewise.
+	(end_symtab_get_static_block): Likewise.
+	(end_symtab_from_static_block): Likewise.
+	* buildsym-legacy.c (augment_type_symtab): Remove.
+	(end_expandable_symtab): Remove.
+	(end_symtab_get_static_block): Remove.
+	(end_symtab_from_static_block): Remove.
+
 2018-07-20  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2read.c: Include buildsym.h.
diff --git a/gdb/buildsym-legacy.c b/gdb/buildsym-legacy.c
index 5ee663daee..3553fa1c0a 100644
--- a/gdb/buildsym-legacy.c
+++ b/gdb/buildsym-legacy.c
@@ -194,14 +194,6 @@ pop_subfile ()
   return buildsym_compunit->pop_subfile ();
 }
 
-struct block *
-end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required)
-{
-  gdb_assert (buildsym_compunit != nullptr);
-  return buildsym_compunit->end_symtab_get_static_block (end_addr, expandable,
-							 required);
-}
-
 /* Delete the buildsym compunit.  */
 
 static void
@@ -213,18 +205,6 @@ free_buildsym_compunit (void)
   buildsym_compunit = NULL;
 }
 
-struct compunit_symtab *
-end_symtab_from_static_block (struct block *static_block,
-			      int section, int expandable)
-{
-  gdb_assert (buildsym_compunit != nullptr);
-  struct compunit_symtab *result
-    = buildsym_compunit->end_symtab_from_static_block (static_block,
-						       section, expandable);
-  free_buildsym_compunit ();
-  return result;
-}
-
 struct compunit_symtab *
 end_symtab (CORE_ADDR end_addr, int section)
 {
@@ -235,24 +215,6 @@ end_symtab (CORE_ADDR end_addr, int section)
   return result;
 }
 
-struct compunit_symtab *
-end_expandable_symtab (CORE_ADDR end_addr, int section)
-{
-  gdb_assert (buildsym_compunit != nullptr);
-  struct compunit_symtab *result
-    = buildsym_compunit->end_expandable_symtab (end_addr, section);
-  free_buildsym_compunit ();
-  return result;
-}
-
-void
-augment_type_symtab ()
-{
-  gdb_assert (buildsym_compunit != nullptr);
-  buildsym_compunit->augment_type_symtab ();
-  free_buildsym_compunit ();
-}
-
 struct context_stack *
 push_context (int desc, CORE_ADDR valu)
 {
diff --git a/gdb/buildsym-legacy.h b/gdb/buildsym-legacy.h
index 191c34478b..aaa9152c4e 100644
--- a/gdb/buildsym-legacy.h
+++ b/gdb/buildsym-legacy.h
@@ -37,25 +37,6 @@
    The compunit symtab pointer ("cust") is returned from both start_symtab
    and end_symtab to simplify the debug info readers.
 
-   There are minor variations on this, e.g., dwarf2read.c splits end_symtab
-   into two calls: end_symtab_get_static_block, end_symtab_from_static_block,
-   but all debug info readers follow this basic flow.
-
-   Reading DWARF Type Units is another variation:
-
-   scoped_free_pendings free_pending;
-   cust = start_symtab (...);
-   ... read debug info ...
-   cust = end_expandable_symtab (...);
-
-   And then reading subsequent Type Units within the containing "Comp Unit"
-   will use a second flow:
-
-   scoped_free_pendings free_pending;
-   cust = restart_symtab (...);
-   ... read debug info ...
-   cust = augment_type_symtab (...);
-
    dbxread.c and xcoffread.c use another variation:
 
    scoped_free_pendings free_pending;
@@ -92,21 +73,8 @@ extern void push_subfile ();
 
 extern const char *pop_subfile ();
 
-extern struct block *end_symtab_get_static_block (CORE_ADDR end_addr,
-						  int expandable,
-						  int required);
-
-extern struct compunit_symtab *
-  end_symtab_from_static_block (struct block *static_block,
-				int section, int expandable);
-
 extern struct compunit_symtab *end_symtab (CORE_ADDR end_addr, int section);
 
-extern struct compunit_symtab *end_expandable_symtab (CORE_ADDR end_addr,
-						      int section);
-
-extern void augment_type_symtab (void);
-
 extern struct context_stack *push_context (int desc, CORE_ADDR valu);
 
 extern struct context_stack pop_context ();