X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbuildsym.c;h=4e5da073723e3d05305b3eb97fe315191aa4f35b;hb=652788a73137d8c16ac67a0cf9a8e51dd336d09e;hp=d0f0ddcfa27894cfb8aa9619772f433afa4b2f0b;hpb=ee6f8984bbdbf340816a7f2aebe736f100601b22;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/buildsym.c b/gdb/buildsym.c index d0f0ddcfa2..4e5da07372 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -1,5 +1,5 @@ /* Support routines for building symbol tables in GDB's internal format. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,49 @@ file-reading routines. Routines to support specific debugging information formats (stabs, - DWARF, etc) belong somewhere else. */ + DWARF, etc) belong somewhere else. + + The basic way this module is used is as follows: + + buildsym_init (); + scoped_free_pendings free_pending; + cust = start_symtab (...); + ... read debug info ... + cust = end_symtab (...); + + 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: + + buildsym_init (); + 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: + + buildsym_init (); + scoped_free_pendings free_pending; + cust = restart_symtab (...); + ... read debug info ... + cust = augment_type_symtab (...); + + dbxread.c and xcoffread.c use another variation: + + buildsym_init (); + scoped_free_pendings free_pending; + cust = start_symtab (...); + ... read debug info ... + cust = end_symtab (...); + ... start_symtab + read + end_symtab repeated ... +*/ #include "defs.h" #include "bfd.h" @@ -32,7 +74,6 @@ #include "gdbtypes.h" #include "complaints.h" #include "expression.h" /* For "enum exp_opcode" used by... */ -#include "bcache.h" #include "filenames.h" /* For DOSish file names. */ #include "macrotab.h" #include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */ @@ -40,6 +81,7 @@ #include "cp-support.h" #include "dictionary.h" #include "addrmap.h" +#include /* Ask buildsym.h to define the vars it normally declares `extern'. */ #define EXTERN @@ -52,24 +94,126 @@ #include "stabsread.h" -/* List of subfiles. */ +/* Buildsym's counterpart to struct compunit_symtab. + TODO(dje): Move all related global state into here. */ + +struct buildsym_compunit +{ + /* Start recording information about a primary source file (IOW, not an + included source file). + COMP_DIR is the directory in which the compilation unit was compiled + (or NULL if not known). */ + + buildsym_compunit (struct objfile *objfile_, const char *name, + const char *comp_dir_, enum language language_, + CORE_ADDR last_addr) + : objfile (objfile_), + m_last_source_file (name == nullptr ? nullptr : xstrdup (name)), + comp_dir (comp_dir_ == nullptr ? nullptr : xstrdup (comp_dir_)), + language (language_), + m_last_source_start_addr (last_addr) + { + } + + ~buildsym_compunit () + { + struct subfile *subfile, *nextsub; -static struct subfile *subfiles; + if (m_pending_macros != nullptr) + free_macro_table (m_pending_macros); -/* The "main" subfile. - In C this is the ".c" file (and similarly for other languages). - This becomes the "primary" symtab of the compilation unit. */ + for (subfile = subfiles; + subfile != NULL; + subfile = nextsub) + { + nextsub = subfile->next; + xfree (subfile->name); + xfree (subfile->line_vector); + xfree (subfile); + } + } -static struct subfile *main_subfile; + void set_last_source_file (const char *name) + { + char *new_name = name == NULL ? NULL : xstrdup (name); + m_last_source_file.reset (new_name); + } -/* List of free `struct pending' structures for reuse. */ + struct macro_table *get_macro_table () + { + if (m_pending_macros == nullptr) + m_pending_macros = new_macro_table (&objfile->per_bfd->storage_obstack, + objfile->per_bfd->macro_cache, + compunit_symtab); + return m_pending_macros; + } -static struct pending *free_pendings; + struct macro_table *release_macros () + { + struct macro_table *result = m_pending_macros; + m_pending_macros = nullptr; + return result; + } + + /* The objfile we're reading debug info from. */ + struct objfile *objfile; + + /* List of subfiles (source files). + Files are added to the front of the list. + This is important mostly for the language determination hacks we use, + which iterate over previously added files. */ + struct subfile *subfiles = nullptr; + + /* The subfile of the main source file. */ + struct subfile *main_subfile = nullptr; + + /* Name of source file whose symbol data we are now processing. This + comes from a symbol of type N_SO for stabs. For DWARF it comes + from the DW_AT_name attribute of a DW_TAG_compile_unit DIE. */ + gdb::unique_xmalloc_ptr m_last_source_file; + + /* E.g., DW_AT_comp_dir if DWARF. Space for this is malloc'd. */ + gdb::unique_xmalloc_ptr comp_dir; + + /* Space for this is not malloc'd, and is assumed to have at least + the same lifetime as objfile. */ + const char *producer = nullptr; + + /* Space for this is not malloc'd, and is assumed to have at least + the same lifetime as objfile. */ + const char *debugformat = nullptr; + + /* The compunit we are building. */ + struct compunit_symtab *compunit_symtab = nullptr; + + /* Language of this compunit_symtab. */ + enum language language; + + /* The macro table for the compilation unit whose symbols we're + currently reading. */ + struct macro_table *m_pending_macros = nullptr; + + /* True if symtab has line number info. This prevents an otherwise + empty symtab from being tossed. */ + bool m_have_line_numbers = false; + + /* Core address of start of text of current source file. This too + comes from the N_SO symbol. For Dwarf it typically comes from the + DW_AT_low_pc attribute of a DW_TAG_compile_unit DIE. */ + CORE_ADDR m_last_source_start_addr; -/* Non-zero if symtab has line number info. This prevents an - otherwise empty symtab from being tossed. */ + /* Stack of subfile names. */ + std::vector m_subfile_stack; +}; -static int have_line_numbers; +/* The work-in-progress of the compunit we are building. + This is created first, before any subfiles by start_symtab. */ + +static struct buildsym_compunit *buildsym_compunit; + +/* List of free `struct pending' structures for reuse. */ + +static struct pending *free_pendings; /* The mutable address map for the compilation unit whose symbols we're currently reading. The symtabs' shared blockvector will @@ -107,17 +251,11 @@ struct pending_block static struct pending_block *pending_blocks; -struct subfile_stack - { - struct subfile_stack *next; - char *name; - }; +/* Currently allocated size of context stack. */ -static struct subfile_stack *subfile_stack; +static int context_stack_size; -/* The macro table for the compilation unit whose symbols we're - currently reading. All the symtabs for the CU will point to this. */ -static struct macro_table *pending_macros; +static void free_buildsym_compunit (void); static int compare_line_numbers (const void *ln1p, const void *ln2p); @@ -125,6 +263,8 @@ static void record_pending_block (struct objfile *objfile, struct block *block, struct pending_block *opblock); +static void free_pending_blocks (); + /* Initial sizes of data structures. These are realloc'd larger if needed, and realloc'd down to the size actually used, when completed. */ @@ -157,7 +297,7 @@ add_symbol_to_list (struct symbol *symbol, struct pending **listhead) } else { - link = (struct pending *) xmalloc (sizeof (struct pending)); + link = XNEW (struct pending); } link->next = *listhead; @@ -193,11 +333,18 @@ find_symbol_in_list (struct pending *list, char *name, int length) return (NULL); } -/* At end of reading syms, or in case of quit, really free as many - `struct pending's as we can easily find. */ +scoped_free_pendings::scoped_free_pendings () +{ + gdb_assert (pending_blocks == nullptr); +} + +/* At end of reading syms, or in case of quit, ensure everything + associated with building symtabs is freed. -void -really_free_pendings (void *dummy) + N.B. This is *not* intended to be used when building psymtabs. Some debug + info readers call this anyway, which is harmless if confusing. */ + +scoped_free_pendings::~scoped_free_pendings () { struct pending *next, *next1; @@ -224,20 +371,17 @@ really_free_pendings (void *dummy) } global_symbols = NULL; - if (pending_macros) - free_macro_table (pending_macros); - if (pending_addrmap) - { - obstack_free (&pending_addrmap_obstack, NULL); - pending_addrmap = NULL; - } + obstack_free (&pending_addrmap_obstack, NULL); + pending_addrmap = NULL; + + free_buildsym_compunit (); } /* This function is called to discard any pending blocks. */ -void -free_pending_blocks (void) +static void +free_pending_blocks () { if (pending_blocks != NULL) { @@ -251,12 +395,14 @@ free_pending_blocks (void) file). Put the block on the list of pending blocks. */ static struct block * -finish_block_internal (struct symbol *symbol, struct pending **listhead, +finish_block_internal (struct symbol *symbol, + struct pending **listhead, struct pending_block *old_blocks, + const struct dynamic_prop *static_link, CORE_ADDR start, CORE_ADDR end, - struct objfile *objfile, int is_global, int expandable) { + struct objfile *objfile = buildsym_compunit->objfile; struct gdbarch *gdbarch = get_objfile_arch (objfile); struct pending *next, *next1; struct block *block; @@ -269,20 +415,23 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, if (symbol) { - BLOCK_DICT (block) = dict_create_linear (&objfile->objfile_obstack, - *listhead); + BLOCK_DICT (block) + = dict_create_linear (&objfile->objfile_obstack, + buildsym_compunit->language, *listhead); } else { if (expandable) { - BLOCK_DICT (block) = dict_create_hashed_expandable (); + BLOCK_DICT (block) + = dict_create_hashed_expandable (buildsym_compunit->language); dict_add_pending (BLOCK_DICT (block), *listhead); } else { BLOCK_DICT (block) = - dict_create_hashed (&objfile->objfile_obstack, *listhead); + dict_create_hashed (&objfile->objfile_obstack, + buildsym_compunit->language, *listhead); } } @@ -342,6 +491,9 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, BLOCK_FUNCTION (block) = NULL; } + if (static_link != NULL) + objfile_register_static_link (objfile, block, static_link); + /* Now "free" the links of the list, and empty the list. */ for (next = *listhead; next; next = next1) @@ -359,15 +511,13 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, { if (symbol) { - complaint (&symfile_complaints, - _("block end address less than block " + complaint (_("block end address less than block " "start address in %s (patched it)"), SYMBOL_PRINT_NAME (symbol)); } else { - complaint (&symfile_complaints, - _("block end address %s less than block " + complaint (_("block end address %s less than block " "start address %s (patched it)"), paddress (gdbarch, BLOCK_END (block)), paddress (gdbarch, BLOCK_START (block))); @@ -399,14 +549,12 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, { if (symbol) { - complaint (&symfile_complaints, - _("inner block not inside outer block in %s"), + complaint (_("inner block not inside outer block in %s"), SYMBOL_PRINT_NAME (symbol)); } else { - complaint (&symfile_complaints, - _("inner block (%s-%s) not " + complaint (_("inner block (%s-%s) not " "inside outer block (%s-%s)"), paddress (gdbarch, BLOCK_START (pblock->block)), paddress (gdbarch, BLOCK_END (pblock->block)), @@ -423,8 +571,15 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, opblock = pblock; } - block_set_using (block, using_directives, &objfile->objfile_obstack); - using_directives = NULL; + block_set_using (block, + (is_global + ? global_using_directives + : local_using_directives), + &objfile->objfile_obstack); + if (is_global) + global_using_directives = NULL; + else + local_using_directives = NULL; record_pending_block (objfile, block, opblock); @@ -432,13 +587,14 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead, } struct block * -finish_block (struct symbol *symbol, struct pending **listhead, +finish_block (struct symbol *symbol, + struct pending **listhead, struct pending_block *old_blocks, - CORE_ADDR start, CORE_ADDR end, - struct objfile *objfile) + const struct dynamic_prop *static_link, + CORE_ADDR start, CORE_ADDR end) { - return finish_block_internal (symbol, listhead, old_blocks, - start, end, objfile, 0, 0); + return finish_block_internal (symbol, listhead, old_blocks, static_link, + start, end, 0, 0); } /* Record BLOCK on the list of all blocks in the file. Put it after @@ -457,8 +613,7 @@ record_pending_block (struct objfile *objfile, struct block *block, if (pending_blocks == NULL) obstack_init (&pending_block_obstack); - pblock = (struct pending_block *) - obstack_alloc (&pending_block_obstack, sizeof (struct pending_block)); + pblock = XOBNEW (&pending_block_obstack, struct pending_block); pblock->block = block; if (opblock) { @@ -503,10 +658,10 @@ record_block_range (struct block *block, addrmap_set_empty (pending_addrmap, start, end_inclusive, block); } - static struct blockvector * -make_blockvector (struct objfile *objfile) +make_blockvector (void) { + struct objfile *objfile = buildsym_compunit->objfile; struct pending_block *next; struct blockvector *blockvector; int i; @@ -560,7 +715,7 @@ make_blockvector (struct objfile *objfile) CORE_ADDR start = BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i)); - complaint (&symfile_complaints, _("block at %s out of order"), + complaint (_("block at %s out of order"), hex_string ((LONGEST) start)); } } @@ -571,19 +726,21 @@ make_blockvector (struct objfile *objfile) /* Start recording information about source code that came from an included (or otherwise merged-in) source file with a different - name. NAME is the name of the file (cannot be NULL), DIRNAME is - the directory in which the file was compiled (or NULL if not - known). */ + name. NAME is the name of the file (cannot be NULL). */ void -start_subfile (const char *name, const char *dirname) +start_subfile (const char *name) { + const char *subfile_dirname; struct subfile *subfile; - /* See if this subfile is already known as a subfile of the current - main source file. */ + gdb_assert (buildsym_compunit != NULL); + + subfile_dirname = buildsym_compunit->comp_dir.get (); - for (subfile = subfiles; subfile; subfile = subfile->next) + /* See if this subfile is already registered. */ + + for (subfile = buildsym_compunit->subfiles; subfile; subfile = subfile->next) { char *subfile_name; @@ -591,8 +748,8 @@ start_subfile (const char *name, const char *dirname) attempt to create an absolute path to compare. */ if (IS_ABSOLUTE_PATH (name) && !IS_ABSOLUTE_PATH (subfile->name) - && subfile->dirname != NULL) - subfile_name = concat (subfile->dirname, SLASH_STRING, + && subfile_dirname != NULL) + subfile_name = concat (subfile_dirname, SLASH_STRING, subfile->name, (char *) NULL); else subfile_name = subfile->name; @@ -608,19 +765,18 @@ start_subfile (const char *name, const char *dirname) xfree (subfile_name); } - /* This subfile is not known. Add an entry for it. Make an entry - for this subfile in the list of all subfiles of the current main - source file. */ + /* This subfile is not known. Add an entry for it. */ + + subfile = XNEW (struct subfile); + memset (subfile, 0, sizeof (struct subfile)); + subfile->buildsym_compunit = buildsym_compunit; + + subfile->next = buildsym_compunit->subfiles; + buildsym_compunit->subfiles = subfile; - subfile = (struct subfile *) xmalloc (sizeof (struct subfile)); - memset ((char *) subfile, 0, sizeof (struct subfile)); - subfile->next = subfiles; - subfiles = subfile; current_subfile = subfile; - /* Save its name and compilation directory name. */ subfile->name = xstrdup (name); - subfile->dirname = (dirname == NULL) ? NULL : xstrdup (dirname); /* Initialize line-number recording for this subfile. */ subfile->line_vector = NULL; @@ -643,13 +799,6 @@ start_subfile (const char *name, const char *dirname) subfile->language = subfile->next->language; } - /* Initialize the debug format string to NULL. We may supply it - later via a call to record_debugformat. */ - subfile->debugformat = NULL; - - /* Similarly for the producer. */ - subfile->producer = NULL; - /* If the filename of this subfile ends in .C, then change the language of any pending subfiles from C to C++. We also accept any other C++ suffixes accepted by deduce_language_from_filename. */ @@ -661,7 +810,7 @@ start_subfile (const char *name, const char *dirname) enum language sublang = deduce_language_from_filename (subfile->name); if (sublang == language_cplus || sublang == language_fortran) - for (s = subfiles; s != NULL; s = s->next) + for (s = buildsym_compunit->subfiles; s != NULL; s = s->next) if (s->language == language_c) s->language = sublang; } @@ -676,24 +825,16 @@ start_subfile (const char *name, const char *dirname) } } -/* Delete the subfiles list. */ +/* Delete the buildsym compunit. */ static void -free_subfiles_list (void) +free_buildsym_compunit (void) { - struct subfile *subfile, *nextsub; - - for (subfile = subfiles; subfile != NULL; subfile = nextsub) - { - nextsub = subfile->next; - xfree (subfile->name); - xfree (subfile->dirname); - xfree (subfile->line_vector); - xfree (subfile); - } - subfiles = NULL; + if (buildsym_compunit == NULL) + return; + delete buildsym_compunit; + buildsym_compunit = NULL; current_subfile = NULL; - main_subfile = NULL; } /* For stabs readers, the first N_SO symbol is assumed to be the @@ -709,12 +850,14 @@ free_subfiles_list (void) directory name actually is (by checking for a trailing '/'). */ void -patch_subfile_names (struct subfile *subfile, char *name) +patch_subfile_names (struct subfile *subfile, const char *name) { - if (subfile != NULL && subfile->dirname == NULL && subfile->name != NULL + if (subfile != NULL + && buildsym_compunit->comp_dir == NULL + && subfile->name != NULL && IS_DIR_SEPARATOR (subfile->name[strlen (subfile->name) - 1])) { - subfile->dirname = subfile->name; + buildsym_compunit->comp_dir.reset (subfile->name); subfile->name = xstrdup (name); set_last_source_file (name); @@ -744,36 +887,21 @@ patch_subfile_names (struct subfile *subfile, char *name) order. */ void -push_subfile (void) +push_subfile () { - struct subfile_stack *tem - = (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack)); - - tem->next = subfile_stack; - subfile_stack = tem; - if (current_subfile == NULL || current_subfile->name == NULL) - { - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); - } - tem->name = current_subfile->name; + gdb_assert (buildsym_compunit != nullptr); + gdb_assert (current_subfile != NULL && current_subfile->name != NULL); + buildsym_compunit->m_subfile_stack.push_back (current_subfile->name); } -char * -pop_subfile (void) +const char * +pop_subfile () { - char *name; - struct subfile_stack *link = subfile_stack; - - if (link == NULL) - { - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); - } - name = link->name; - subfile_stack = link->next; - xfree ((void *) link); - return (name); + gdb_assert (buildsym_compunit != nullptr); + gdb_assert (!buildsym_compunit->m_subfile_stack.empty ()); + const char *name = buildsym_compunit->m_subfile_stack.back (); + buildsym_compunit->m_subfile_stack.pop_back (); + return name; } /* Add a linetable entry for line number LINE and address PC to the @@ -798,7 +926,7 @@ record_line (struct subfile *subfile, int line, CORE_ADDR pc) xmalloc (sizeof (struct linetable) + subfile->line_vector_length * sizeof (struct linetable_entry)); subfile->line_vector->nitems = 0; - have_line_numbers = 1; + buildsym_compunit->m_have_line_numbers = true; } if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length) @@ -860,71 +988,112 @@ compare_line_numbers (const void *ln1p, const void *ln2p) return ln1->line - ln2->line; } -/* Return the macro table. - Initialize it if this is the first use. */ +/* See buildsym.h. */ + +struct compunit_symtab * +buildsym_compunit_symtab (void) +{ + gdb_assert (buildsym_compunit != NULL); + + return buildsym_compunit->compunit_symtab; +} + +/* See buildsym.h. */ struct macro_table * -get_macro_table (struct objfile *objfile, const char *comp_dir) +get_macro_table (void) { - if (! pending_macros) - pending_macros = new_macro_table (&objfile->per_bfd->storage_obstack, - objfile->per_bfd->macro_cache, - comp_dir); - return pending_macros; + struct objfile *objfile; + + gdb_assert (buildsym_compunit != NULL); + return buildsym_compunit->get_macro_table (); } -/* Start a new symtab for a new source file. Called, for example, +/* Init state to prepare for building a symtab. + Note: This can't be done in buildsym_init because dbxread.c and xcoffread.c + can call start_symtab+end_symtab multiple times after one call to + buildsym_init. */ + +static void +prepare_for_building () +{ + local_symbols = NULL; + local_using_directives = NULL; + + context_stack_depth = 0; + + /* These should have been reset either by successful completion of building + a symtab, or by the scoped_free_pendings destructor. */ + gdb_assert (file_symbols == NULL); + gdb_assert (global_symbols == NULL); + gdb_assert (global_using_directives == NULL); + gdb_assert (pending_addrmap == NULL); + gdb_assert (current_subfile == NULL); + gdb_assert (buildsym_compunit == nullptr); +} + +/* Start a new symtab for a new source file in OBJFILE. Called, for example, when a stabs symbol of type N_SO is seen, or when a DWARF TAG_compile_unit DIE is seen. It indicates the start of data for one original source file. - NAME is the name of the file (cannot be NULL). DIRNAME is the directory in - which the file was compiled (or NULL if not known). START_ADDR is the - lowest address of objects in the file (or 0 if not known). */ + NAME is the name of the file (cannot be NULL). COMP_DIR is the + directory in which the file was compiled (or NULL if not known). + START_ADDR is the lowest address of objects in the file (or 0 if + not known). LANGUAGE is the language of the source file, or + language_unknown if not known, in which case it'll be deduced from + the filename. */ -void -start_symtab (const char *name, const char *dirname, CORE_ADDR start_addr) +struct compunit_symtab * +start_symtab (struct objfile *objfile, const char *name, const char *comp_dir, + CORE_ADDR start_addr, enum language language) { - restart_symtab (start_addr); - set_last_source_file (name); - start_subfile (name, dirname); + prepare_for_building (); + + buildsym_compunit = new struct buildsym_compunit (objfile, name, comp_dir, + language, start_addr); + + /* Allocate the compunit symtab now. The caller needs it to allocate + non-primary symtabs. It is also needed by get_macro_table. */ + buildsym_compunit->compunit_symtab = allocate_compunit_symtab (objfile, + name); + + /* Build the subfile for NAME (the main source file) so that we can record + a pointer to it for later. + IMPORTANT: Do not allocate a struct symtab for NAME here. + It can happen that the debug info provides a different path to NAME than + DIRNAME,NAME. We cope with this in watch_main_source_file_lossage but + that only works if the main_subfile doesn't have a symtab yet. */ + start_subfile (name); /* Save this so that we don't have to go looking for it at the end of the subfiles list. */ - main_subfile = current_subfile; + buildsym_compunit->main_subfile = current_subfile; + + return buildsym_compunit->compunit_symtab; } /* Restart compilation for a symtab. + CUST is the result of end_expandable_symtab. + NAME, START_ADDR are the source file we are resuming with. + This is used when a symtab is built from multiple sources. - The symtab is first built with start_symtab and then for each additional - piece call restart_symtab. */ + The symtab is first built with start_symtab/end_expandable_symtab + and then for each additional piece call restart_symtab/augment_*_symtab. + Note: At the moment there is only augment_type_symtab. */ void -restart_symtab (CORE_ADDR start_addr) +restart_symtab (struct compunit_symtab *cust, + const char *name, CORE_ADDR start_addr) { - set_last_source_file (NULL); - last_source_start_addr = start_addr; - file_symbols = NULL; - global_symbols = NULL; - within_function = 0; - have_line_numbers = 0; - - /* Context stack is initially empty. Allocate first one with room - for 10 levels; reuse it forever afterward. */ - if (context_stack == NULL) - { - context_stack_size = INITIAL_CONTEXT_STACK_SIZE; - context_stack = (struct context_stack *) - xmalloc (context_stack_size * sizeof (struct context_stack)); - } - context_stack_depth = 0; - - /* We shouldn't have any address map at this point. */ - gdb_assert (! pending_addrmap); - - /* Reset the sub source files list. The list should already be empty, - but free it anyway in case some code didn't finish cleaning up after - an error. */ - free_subfiles_list (); + prepare_for_building (); + + buildsym_compunit + = new struct buildsym_compunit (COMPUNIT_OBJFILE (cust), + name, + COMPUNIT_DIRNAME (cust), + compunit_language (cust), + start_addr); + buildsym_compunit->compunit_symtab = cust; } /* Subroutine of end_symtab to simplify it. Look for a subfile that @@ -934,36 +1103,41 @@ restart_symtab (CORE_ADDR start_addr) main source file's subfile and discard the other subfile. This can happen because of a compiler bug or from the user playing games with #line or from things like a distributed build system that - manipulates the debug info. */ + manipulates the debug info. This can also happen from an innocent + symlink in the paths, we don't canonicalize paths here. */ static void watch_main_source_file_lossage (void) { - struct subfile *subfile; + struct subfile *mainsub, *subfile; - /* We have to watch for mainsub == NULL here. It's a quirk of + /* We have to watch for buildsym_compunit == NULL here. It's a quirk of end_symtab, it can return NULL so there may not be a main subfile. */ - if (main_subfile == NULL) + if (buildsym_compunit == NULL) return; + /* Get the main source file. */ + mainsub = buildsym_compunit->main_subfile; + /* If the main source file doesn't have any line number or symbol info, look for an alias in another subfile. */ - if (main_subfile->line_vector == NULL - && main_subfile->symtab == NULL) + if (mainsub->line_vector == NULL + && mainsub->symtab == NULL) { - const char *mainbase = lbasename (main_subfile->name); + const char *mainbase = lbasename (mainsub->name); int nr_matches = 0; struct subfile *prevsub; struct subfile *mainsub_alias = NULL; struct subfile *prev_mainsub_alias = NULL; prevsub = NULL; - for (subfile = subfiles; - /* Stop before we get to the last one. */ - subfile->next; + for (subfile = buildsym_compunit->subfiles; + subfile != NULL; subfile = subfile->next) { + if (subfile == mainsub) + continue; if (filename_cmp (lbasename (subfile->name), mainbase) == 0) { ++nr_matches; @@ -975,53 +1149,46 @@ watch_main_source_file_lossage (void) if (nr_matches == 1) { - gdb_assert (mainsub_alias != NULL && mainsub_alias != main_subfile); + gdb_assert (mainsub_alias != NULL && mainsub_alias != mainsub); /* Found a match for the main source file. Copy its line_vector and symtab to the main subfile and then discard it. */ - main_subfile->line_vector = mainsub_alias->line_vector; - main_subfile->line_vector_length = mainsub_alias->line_vector_length; - main_subfile->symtab = mainsub_alias->symtab; + mainsub->line_vector = mainsub_alias->line_vector; + mainsub->line_vector_length = mainsub_alias->line_vector_length; + mainsub->symtab = mainsub_alias->symtab; if (prev_mainsub_alias == NULL) - subfiles = mainsub_alias->next; + buildsym_compunit->subfiles = mainsub_alias->next; else prev_mainsub_alias->next = mainsub_alias->next; xfree (mainsub_alias->name); - xfree (mainsub_alias->dirname); xfree (mainsub_alias); } } } -/* Helper function for qsort. Parameters are `struct block *' pointers, - function sorts them in descending order by their BLOCK_START. */ - -static int -block_compar (const void *ap, const void *bp) -{ - const struct block *a = *(const struct block **) ap; - const struct block *b = *(const struct block **) bp; - - return ((BLOCK_START (b) > BLOCK_START (a)) - - (BLOCK_START (b) < BLOCK_START (a))); -} - -/* Reset globals used to build symtabs. */ +/* Reset state after a successful building of a symtab. + This exists because dbxread.c and xcoffread.c can call + start_symtab+end_symtab multiple times after one call to buildsym_init, + and before the scoped_free_pendings destructor is called. + We keep the free_pendings list around for dbx/xcoff sake. */ static void reset_symtab_globals (void) { - set_last_source_file (NULL); - free_subfiles_list (); - pending_macros = NULL; + local_symbols = NULL; + local_using_directives = NULL; + file_symbols = NULL; + global_symbols = NULL; + global_using_directives = NULL; + if (pending_addrmap) - { - obstack_free (&pending_addrmap_obstack, NULL); - pending_addrmap = NULL; - } + obstack_free (&pending_addrmap_obstack, NULL); + pending_addrmap = NULL; + + free_buildsym_compunit (); } /* Implementation of the first part of end_symtab. It allows modifying @@ -1039,9 +1206,10 @@ reset_symtab_globals (void) not contain any symbols. */ struct block * -end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, - int expandable, int required) +end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required) { + struct objfile *objfile = buildsym_compunit->objfile; + /* Finish the lexical context of the last function in the file; pop the context stack. */ @@ -1050,8 +1218,8 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, struct context_stack *cstk = pop_context (); /* Make a block for the local symbols within. */ - finish_block (cstk->name, &local_symbols, cstk->old_blocks, - cstk->start_addr, end_addr, objfile); + finish_block (cstk->name, &local_symbols, cstk->old_blocks, NULL, + cstk->start_addr, end_addr); if (context_stack_depth > 0) { @@ -1060,8 +1228,7 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, same. FIXME: Find out why it is happening. This is not believed to happen in most cases (even for coffread.c); it used to be an abort(). */ - complaint (&symfile_complaints, - _("Context stack not empty in end_symtab")); + complaint (_("Context stack not empty in end_symtab")); context_stack_depth = 0; } } @@ -1071,28 +1238,25 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, if ((objfile->flags & OBJF_REORDERED) && pending_blocks) { - unsigned count = 0; struct pending_block *pb; - struct block **barray, **bp; - struct cleanup *back_to; - - for (pb = pending_blocks; pb != NULL; pb = pb->next) - count++; - barray = xmalloc (sizeof (*barray) * count); - back_to = make_cleanup (xfree, barray); + std::vector barray; - bp = barray; for (pb = pending_blocks; pb != NULL; pb = pb->next) - *bp++ = pb->block; - - qsort (barray, count, sizeof (*barray), block_compar); - - bp = barray; + barray.push_back (pb->block); + + /* Sort blocks by start address in descending order. Blocks with the + same start address must remain in the original order to preserve + inline function caller/callee relationships. */ + std::stable_sort (barray.begin (), barray.end (), + [] (const block *a, const block *b) + { + return BLOCK_START (a) > BLOCK_START (b); + }); + + int i = 0; for (pb = pending_blocks; pb != NULL; pb = pb->next) - pb->block = *bp++; - - do_cleanups (back_to); + pb->block = barray[i++]; } /* Cleanup any undefined types that have been left hanging around @@ -1112,8 +1276,9 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, && pending_blocks == NULL && file_symbols == NULL && global_symbols == NULL - && have_line_numbers == 0 - && pending_macros == NULL) + && !buildsym_compunit->m_have_line_numbers + && buildsym_compunit->m_pending_macros == NULL + && global_using_directives == NULL) { /* Ignore symtabs that have no functions with real debugging info. */ return NULL; @@ -1121,48 +1286,9 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile, else { /* Define the STATIC_BLOCK. */ - return finish_block_internal (NULL, &file_symbols, NULL, - last_source_start_addr, end_addr, objfile, - 0, expandable); - } -} - -/* Subroutine of end_symtab_from_static_block to simplify it. - Handle the "no blockvector" case. - When this happens there is nothing to record, so just free up - any memory we allocated while reading debug info. */ - -static void -end_symtab_without_blockvector (struct objfile *objfile) -{ - struct subfile *subfile; - - /* Since we are ignoring these subfiles, we also need - to unlink the associated empty symtab that we created. - Otherwise, we can run into trouble because various parts - such as the block-vector are uninitialized whereas - the rest of the code assumes that they are. - - We can only unlink the symtab. We can't free it because - it was allocated on the objfile obstack. */ - - for (subfile = subfiles; subfile != NULL; subfile = subfile->next) - { - if (subfile->symtab) - { - struct symtab *s; - - if (objfile->symtabs == subfile->symtab) - objfile->symtabs = objfile->symtabs->next; - else - ALL_OBJFILE_SYMTABS (objfile, s) - if (s->next == subfile->symtab) - { - s->next = s->next->next; - break; - } - subfile->symtab = NULL; - } + return finish_block_internal (NULL, &file_symbols, NULL, NULL, + buildsym_compunit->m_last_source_start_addr, + end_addr, 0, expandable); } } @@ -1170,26 +1296,28 @@ end_symtab_without_blockvector (struct objfile *objfile) Handle the "have blockvector" case. See end_symtab_from_static_block for a description of the arguments. */ -static struct symtab * +static struct compunit_symtab * end_symtab_with_blockvector (struct block *static_block, - struct objfile *objfile, int section, - int expandable) + int section, int expandable) { + struct objfile *objfile = buildsym_compunit->objfile; + struct compunit_symtab *cu = buildsym_compunit->compunit_symtab; struct symtab *symtab; struct blockvector *blockvector; struct subfile *subfile; CORE_ADDR end_addr; gdb_assert (static_block != NULL); - gdb_assert (subfiles != NULL); + gdb_assert (buildsym_compunit != NULL); + gdb_assert (buildsym_compunit->subfiles != NULL); end_addr = BLOCK_END (static_block); /* Create the GLOBAL_BLOCK and build the blockvector. */ - finish_block_internal (NULL, &global_symbols, NULL, - last_source_start_addr, end_addr, objfile, + finish_block_internal (NULL, &global_symbols, NULL, NULL, + buildsym_compunit->m_last_source_start_addr, end_addr, 1, expandable); - blockvector = make_blockvector (objfile); + blockvector = make_blockvector (); /* Read the line table if it has to be read separately. This is only used by xcoffread.c. */ @@ -1201,9 +1329,12 @@ end_symtab_with_blockvector (struct block *static_block, line number information. */ watch_main_source_file_lossage (); - /* Now create the symtab objects proper, one for each subfile. */ + /* Now create the symtab objects proper, if not already done, + one for each subfile. */ - for (subfile = subfiles; subfile != NULL; subfile = subfile->next) + for (subfile = buildsym_compunit->subfiles; + subfile != NULL; + subfile = subfile->next) { int linetablesize = 0; @@ -1223,35 +1354,22 @@ end_symtab_with_blockvector (struct block *static_block, /* Allocate a symbol table if necessary. */ if (subfile->symtab == NULL) - subfile->symtab = allocate_symtab (subfile->name, objfile); + subfile->symtab = allocate_symtab (cu, subfile->name); symtab = subfile->symtab; /* Fill in its components. */ - symtab->blockvector = blockvector; - symtab->macro_table = pending_macros; + if (subfile->line_vector) { /* Reallocate the line table on the symbol obstack. */ - symtab->linetable = (struct linetable *) + SYMTAB_LINETABLE (symtab) = (struct linetable *) obstack_alloc (&objfile->objfile_obstack, linetablesize); - memcpy (symtab->linetable, subfile->line_vector, linetablesize); - } - else - { - symtab->linetable = NULL; - } - symtab->block_line_section = section; - if (subfile->dirname) - { - /* Reallocate the dirname on the symbol obstack. */ - SYMTAB_DIRNAME (symtab) = - obstack_copy0 (&objfile->objfile_obstack, - subfile->dirname, - strlen (subfile->dirname)); + memcpy (SYMTAB_LINETABLE (symtab), subfile->line_vector, + linetablesize); } else { - SYMTAB_DIRNAME (symtab) = NULL; + SYMTAB_LINETABLE (symtab) = NULL; } /* Use whatever language we have been using for this @@ -1261,33 +1379,66 @@ end_symtab_with_blockvector (struct block *static_block, opinion of what language it is from things we found in the symbols. */ symtab->language = subfile->language; + } + + /* Make sure the symtab of main_subfile is the first in its list. */ + { + struct symtab *main_symtab, *prev_symtab; - /* Save the debug format string (if any) in the symtab. */ - symtab->debugformat = subfile->debugformat; + main_symtab = buildsym_compunit->main_subfile->symtab; + prev_symtab = NULL; + ALL_COMPUNIT_FILETABS (cu, symtab) + { + if (symtab == main_symtab) + { + if (prev_symtab != NULL) + { + prev_symtab->next = main_symtab->next; + main_symtab->next = COMPUNIT_FILETABS (cu); + COMPUNIT_FILETABS (cu) = main_symtab; + } + break; + } + prev_symtab = symtab; + } + gdb_assert (main_symtab == COMPUNIT_FILETABS (cu)); + } - /* Similarly for the producer. */ - symtab->producer = subfile->producer; + /* Fill out the compunit symtab. */ - /* All symtabs for the main file and the subfiles share a - blockvector, so we need to clear primary for everything - but the main file. */ - set_symtab_primary (symtab, 0); + if (buildsym_compunit->comp_dir != NULL) + { + /* Reallocate the dirname on the symbol obstack. */ + const char *comp_dir = buildsym_compunit->comp_dir.get (); + COMPUNIT_DIRNAME (cu) + = (const char *) obstack_copy0 (&objfile->objfile_obstack, + comp_dir, strlen (comp_dir)); } - /* The main source file is the primary symtab. */ - gdb_assert (main_subfile->symtab != NULL); - symtab = main_subfile->symtab; - set_symtab_primary (symtab, 1); + /* Save the debug format string (if any) in the symtab. */ + COMPUNIT_DEBUGFORMAT (cu) = buildsym_compunit->debugformat; + + /* Similarly for the producer. */ + COMPUNIT_PRODUCER (cu) = buildsym_compunit->producer; + + COMPUNIT_BLOCKVECTOR (cu) = blockvector; { - struct block *b = BLOCKVECTOR_BLOCK (symtab->blockvector, GLOBAL_BLOCK); + struct block *b = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); - set_block_symtab (b, symtab); + set_block_compunit_symtab (b, cu); } + COMPUNIT_BLOCK_LINE_SECTION (cu) = section; + + COMPUNIT_MACRO_TABLE (cu) = buildsym_compunit->release_macros (); + /* Default any symbols without a specified symtab to the primary symtab. */ { int block_i; + /* The main source file's symtab. */ + symtab = COMPUNIT_FILETABS (cu); + for (block_i = 0; block_i < BLOCKVECTOR_NBLOCKS (blockvector); block_i++) { struct block *block = BLOCKVECTOR_BLOCK (blockvector, block_i); @@ -1297,19 +1448,21 @@ end_symtab_with_blockvector (struct block *static_block, /* Inlined functions may have symbols not in the global or static symbol lists. */ if (BLOCK_FUNCTION (block) != NULL) - if (SYMBOL_SYMTAB (BLOCK_FUNCTION (block)) == NULL) - SYMBOL_SYMTAB (BLOCK_FUNCTION (block)) = symtab; + if (symbol_symtab (BLOCK_FUNCTION (block)) == NULL) + symbol_set_symtab (BLOCK_FUNCTION (block), symtab); /* Note that we only want to fix up symbols from the local blocks, not blocks coming from included symtabs. That is why we use ALL_DICT_SYMBOLS here and not ALL_BLOCK_SYMBOLS. */ ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym) - if (SYMBOL_SYMTAB (sym) == NULL) - SYMBOL_SYMTAB (sym) = symtab; + if (symbol_symtab (sym) == NULL) + symbol_set_symtab (sym, symtab); } } - return symtab; + add_compunit_symtab_to_objfile (cu); + + return cu; } /* Implementation of the second part of end_symtab. Pass STATIC_BLOCK @@ -1321,27 +1474,31 @@ end_symtab_with_blockvector (struct block *static_block, If EXPANDABLE is non-zero the GLOBAL_BLOCK dictionary is made expandable. */ -struct symtab * +struct compunit_symtab * end_symtab_from_static_block (struct block *static_block, - struct objfile *objfile, int section, - int expandable) + int section, int expandable) { - struct symtab *s; + struct compunit_symtab *cu; if (static_block == NULL) { - end_symtab_without_blockvector (objfile); - s = NULL; + /* Handle the "no blockvector" case. + When this happens there is nothing to record, so there's nothing + to do: memory will be freed up later. + + Note: We won't be adding a compunit to the objfile's list of + compunits, so there's nothing to unchain. However, since each symtab + is added to the objfile's obstack we can't free that space. + We could do better, but this is believed to be a sufficiently rare + event. */ + cu = NULL; } else - { - s = end_symtab_with_blockvector (static_block, objfile, section, - expandable); - } + cu = end_symtab_with_blockvector (static_block, section, expandable); reset_symtab_globals (); - return s; + return cu; } /* Finish the symbol definitions for one main source file, close off @@ -1365,32 +1522,33 @@ end_symtab_from_static_block (struct block *static_block, call end_symtab_get_static_block and end_symtab_from_static_block yourself. */ -struct symtab * -end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section) +struct compunit_symtab * +end_symtab (CORE_ADDR end_addr, int section) { struct block *static_block; - static_block = end_symtab_get_static_block (end_addr, objfile, 0, 0); - return end_symtab_from_static_block (static_block, objfile, section, 0); + static_block = end_symtab_get_static_block (end_addr, 0, 0); + return end_symtab_from_static_block (static_block, section, 0); } /* Same as end_symtab except create a symtab that can be later added to. */ -struct symtab * -end_expandable_symtab (CORE_ADDR end_addr, struct objfile *objfile, - int section) +struct compunit_symtab * +end_expandable_symtab (CORE_ADDR end_addr, int section) { struct block *static_block; - static_block = end_symtab_get_static_block (end_addr, objfile, 1, 0); - return end_symtab_from_static_block (static_block, objfile, section, 1); + static_block = end_symtab_get_static_block (end_addr, 1, 0); + return end_symtab_from_static_block (static_block, section, 1); } /* Subroutine of augment_type_symtab to simplify it. - Attach SYMTAB to all symbols in PENDING_LIST that don't have one. */ + Attach the main source file's symtab to all symbols in PENDING_LIST that + don't have one. */ static void -set_missing_symtab (struct pending *pending_list, struct symtab *symtab) +set_missing_symtab (struct pending *pending_list, + struct compunit_symtab *cu) { struct pending *pending; int i; @@ -1399,8 +1557,8 @@ set_missing_symtab (struct pending *pending_list, struct symtab *symtab) { for (i = 0; i < pending->nsyms; ++i) { - if (SYMBOL_SYMTAB (pending->symbol[i]) == NULL) - SYMBOL_SYMTAB (pending->symbol[i]) = symtab; + if (symbol_symtab (pending->symbol[i]) == NULL) + symbol_set_symtab (pending->symbol[i], COMPUNIT_FILETABS (cu)); } } } @@ -1410,23 +1568,22 @@ set_missing_symtab (struct pending *pending_list, struct symtab *symtab) This is the case for DWARF4 Type Units. */ void -augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab) +augment_type_symtab (void) { - const struct blockvector *blockvector = primary_symtab->blockvector; + struct compunit_symtab *cust = buildsym_compunit->compunit_symtab; + const struct blockvector *blockvector = COMPUNIT_BLOCKVECTOR (cust); if (context_stack_depth > 0) { - complaint (&symfile_complaints, - _("Context stack not empty in augment_type_symtab")); + complaint (_("Context stack not empty in augment_type_symtab")); context_stack_depth = 0; } if (pending_blocks != NULL) - complaint (&symfile_complaints, _("Blocks in a type symtab")); - if (pending_macros != NULL) - complaint (&symfile_complaints, _("Macro in a type symtab")); - if (have_line_numbers) - complaint (&symfile_complaints, - _("Line numbers recorded in a type symtab")); + complaint (_("Blocks in a type symtab")); + if (buildsym_compunit->m_pending_macros != NULL) + complaint (_("Macro in a type symtab")); + if (buildsym_compunit->m_have_line_numbers) + complaint (_("Line numbers recorded in a type symtab")); if (file_symbols != NULL) { @@ -1434,7 +1591,7 @@ augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab) /* First mark any symbols without a specified symtab as belonging to the primary symtab. */ - set_missing_symtab (file_symbols, primary_symtab); + set_missing_symtab (file_symbols, cust); dict_add_pending (BLOCK_DICT (block), file_symbols); } @@ -1445,7 +1602,7 @@ augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab) /* First mark any symbols without a specified symtab as belonging to the primary symtab. */ - set_missing_symtab (global_symbols, primary_symtab); + set_missing_symtab (global_symbols, cust); dict_add_pending (BLOCK_DICT (block), global_symbols); } @@ -1460,7 +1617,7 @@ augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab) struct context_stack * push_context (int desc, CORE_ADDR valu) { - struct context_stack *new; + struct context_stack *newobj; if (context_stack_depth == context_stack_size) { @@ -1470,18 +1627,18 @@ push_context (int desc, CORE_ADDR valu) (context_stack_size * sizeof (struct context_stack))); } - new = &context_stack[context_stack_depth++]; - new->depth = desc; - new->locals = local_symbols; - new->old_blocks = pending_blocks; - new->start_addr = valu; - new->using_directives = using_directives; - new->name = NULL; + newobj = &context_stack[context_stack_depth++]; + newobj->depth = desc; + newobj->locals = local_symbols; + newobj->old_blocks = pending_blocks; + newobj->start_addr = valu; + newobj->local_using_directives = local_using_directives; + newobj->name = NULL; local_symbols = NULL; - using_directives = NULL; + local_using_directives = NULL; - return new; + return newobj; } /* Pop a context block. Returns the address of the context block just @@ -1496,77 +1653,56 @@ pop_context (void) -/* Compute a small integer hash code for the given name. */ - -int -hashname (const char *name) -{ - return (hash(name,strlen(name)) % HASHSIZE); -} - - void record_debugformat (const char *format) { - current_subfile->debugformat = format; + buildsym_compunit->debugformat = format; } void record_producer (const char *producer) { - current_subfile->producer = producer; + buildsym_compunit->producer = producer; } -/* Merge the first symbol list SRCLIST into the second symbol list - TARGETLIST by repeated calls to add_symbol_to_list(). This - procedure "frees" each link of SRCLIST by adding it to the - free_pendings list. Caller must set SRCLIST to a null list after - calling this function. + - Void return. */ +/* See buildsym.h. */ void -merge_symbol_lists (struct pending **srclist, struct pending **targetlist) +set_last_source_file (const char *name) { - int i; - - if (!srclist || !*srclist) - return; - - /* Merge in elements from current link. */ - for (i = 0; i < (*srclist)->nsyms; i++) - add_symbol_to_list ((*srclist)->symbol[i], targetlist); - - /* Recurse on next. */ - merge_symbol_lists (&(*srclist)->next, targetlist); - - /* "Free" the current link. */ - (*srclist)->next = free_pendings; - free_pendings = (*srclist); + gdb_assert (buildsym_compunit != nullptr || name == nullptr); + if (buildsym_compunit != nullptr) + buildsym_compunit->set_last_source_file (name); } - -/* Name of source file whose symbol data we are now processing. This - comes from a symbol of type N_SO for stabs. For Dwarf it comes - from the DW_AT_name attribute of a DW_TAG_compile_unit DIE. */ +/* See buildsym.h. */ -static char *last_source_file; +const char * +get_last_source_file (void) +{ + if (buildsym_compunit == nullptr) + return nullptr; + return buildsym_compunit->m_last_source_file.get (); +} /* See buildsym.h. */ void -set_last_source_file (const char *name) +set_last_source_start_addr (CORE_ADDR addr) { - xfree (last_source_file); - last_source_file = name == NULL ? NULL : xstrdup (name); + gdb_assert (buildsym_compunit != nullptr); + buildsym_compunit->m_last_source_start_addr = addr; } /* See buildsym.h. */ -const char * -get_last_source_file (void) +CORE_ADDR +get_last_source_start_addr () { - return last_source_file; + gdb_assert (buildsym_compunit != nullptr); + return buildsym_compunit->m_last_source_start_addr; } @@ -1576,27 +1712,25 @@ get_last_source_file (void) corresponding to a psymtab. */ void -buildsym_init (void) +buildsym_init () { - free_pendings = NULL; - file_symbols = NULL; - global_symbols = NULL; - pending_blocks = NULL; - pending_macros = NULL; - using_directives = NULL; - subfile_stack = NULL; - - /* We shouldn't have any address map at this point. */ - gdb_assert (! pending_addrmap); pending_addrmap_interesting = 0; -} -/* Initialize anything that needs initializing when a completely new - symbol file is specified (not just adding some symbols from another - file, e.g. a shared library). */ + /* Context stack is initially empty. Allocate first one with room + for a few levels; reuse it forever afterward. */ + if (context_stack == NULL) + { + context_stack_size = INITIAL_CONTEXT_STACK_SIZE; + context_stack = XNEWVEC (struct context_stack, context_stack_size); + } -void -buildsym_new_init (void) -{ - buildsym_init (); + /* Ensure the scoped_free_pendings destructor was called after + the last time. */ + gdb_assert (free_pendings == NULL); + gdb_assert (pending_blocks == NULL); + gdb_assert (file_symbols == NULL); + gdb_assert (global_symbols == NULL); + gdb_assert (global_using_directives == NULL); + gdb_assert (pending_addrmap == NULL); + gdb_assert (buildsym_compunit == NULL); }