[RFA 36/42] Remove reset_symtab_globals

Tom Tromey
2018-05-23T06:16:23Z

This patch arranges for the remaining buildsym global --
buildsym_compunit -- to only be cleared by the wrapper functions, not
by methods on struct buildsym_compunit. In the process,
reset_symtab_globals is removed.

2018-05-22 Tom Tromey <tom@tromey.com>

* buildsym.c (reset_symtab_globals): Remove.
(buildsym_compunit::end_symtab_from_static_block): Update.
(buildsym_compunit::augment_type_symtab): Update.
(end_symtab_from_static_block): Call free_buildsym_compunit.
(augment_type_symtab, end_symtab, end_expandable_symtab):
Likewise.
---
gdb/ChangeLog | 9 +++++++++
gdb/buildsym.c | 20 ++++----------------
2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index b9be6dd61a..16756d8835 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1251,14 +1251,6 @@ buildsym_compunit::watch_main_source_file_lossage ()
}
}

-/* Reset state after a successful building of a symtab. */
-
-static void
-reset_symtab_globals (void)
-{
- free_buildsym_compunit ();
-}
-
/* Implementation of the first part of end_symtab. It allows modifying
STATIC_BLOCK before it gets finalized by end_symtab_from_static_block.
If the returned value is NULL there is no blockvector created for
@@ -1562,8 +1554,6 @@ buildsym_compunit::end_symtab_from_static_block (struct block *static_block,
else
cu = end_symtab_with_blockvector (static_block, section, expandable);

- reset_symtab_globals ();
-
return cu;
}

@@ -1672,8 +1662,6 @@ buildsym_compunit::augment_type_symtab ()
dict_add_pending (BLOCK_DICT (block),
m_global_symbols);
}
-
- reset_symtab_globals ();
}

/* Push a context block. Args are an identifying nesting level
@@ -1899,7 +1887,7 @@ end_symtab_from_static_block (struct block *static_block,
struct compunit_symtab *result
= buildsym_compunit->end_symtab_from_static_block (static_block,
section, expandable);
- reset_symtab_globals ();
+ free_buildsym_compunit ();
return result;
}

@@ -1909,7 +1897,7 @@ end_symtab (CORE_ADDR end_addr, int section)
gdb_assert (buildsym_compunit != nullptr);
struct compunit_symtab *result
= buildsym_compunit->end_symtab (end_addr, section);
- reset_symtab_globals ();
+ free_buildsym_compunit ();
return result;
}

@@ -1919,7 +1907,7 @@ 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);
- reset_symtab_globals ();
+ free_buildsym_compunit ();
return result;
}

@@ -1928,7 +1916,7 @@ augment_type_symtab ()
{
gdb_assert (buildsym_compunit != nullptr);
buildsym_compunit->augment_type_symtab ();
- reset_symtab_globals ();
+ free_buildsym_compunit ();
}

struct context_stack *
--
2.13.6