22cee43f9a
Consider the following declaration:
function Foo (I : Integer) return Integer renames Pack.Bar;
As Foo is not materialized as a routine whose name is derived from Foo,
GDB currently cannot use it:
(gdb) print foo(0)
No definition of "foo" in current context.
However, compilers can emit DW_TAG_imported_declaration in order to
materialize the fact that Foo is actually another name for Pack.Bar.
This commit enhances the DWARF reader to record global renamings (it
used to put global ones in a static block) and enhances the Ada engine
to leverage this information during symbol lookup.
gdb/ChangeLog:
* ada-lang.c: Include namespace.h
(aux_add_nonlocal_symbols): Fix a function name in comment.
(ada_add_block_renamings): New.
(add_nonlocal_symbols): Add global renamings handling.
(ada_lookup_symbol_list_worker): Move the symbol lookup part
to...
(ada_add_all_symbols): ... this new function.
(ada_add_block_symbols): Try to match the input name against the
"using directives list", perform a recursive symbol lookup on
the matched declarations.
* block.h (struct block): Move the_namespace to top-level as
namespace_info. Remove the language_specific field.
(BLOCK_NAMESPACE): Update access to the namespace_info field.
* buildsym.h (using_directives): Rename into...
(local_using_directives): ... this.
(global_using_directives): New.
(struct context_stack): Rename the using_directives field into
local_using_directives.
* buildsym.c (finish_block_internal): Deal with the proper
using directives repository (local or global).
(prepare_for_building): Reset local_using_directives. Assert
that there is no pending global using directive.
(reset_symtab_globals): Reset global_using_directives and
local_using_directives.
(end_symtab_get_static_block): Don't ignore symtabs that have
only using directives.
(push_context): Update references to local_using_directives.
(buildsym_init): Do not reset using_directives.
* cp-support.c: Include namespace.h.
* cp-support.h (struct using_direct): Move to namespace.h.
(cp_add_using_directives): Move to namespace.h.
* cp-namespace.c: Include namespace.h
(cp_add_using_directive): Move to namespace.c, rename it to
add_using_directive, add a "using_directives" argument and use
it as the pending using directives repository. All callers
updated.
* dwarf2read.c (using_directives): New.
(read_import_statement): Call using_directives.
(read_func_scope): Update references to local_using_directives.
(read_lexical_block_scope): Likewise.
(read_namespace): Update the heading comment, call
using_directives.
* namespace.h: New file.
* namespace.c: New file.
* Makefile.in (SFILES): Add namespace.c.
(COMMON_OBS): Add namespace.o
gdb/testsuite/ChangeLog:
* gdb.ada/fun_renaming.exp: New testcase.
* gdb.ada/fun_renaming/fun_renaming.adb: New file.
* gdb.ada/fun_renaming/pack.adb: New file.
* gdb.ada/fun_renaming/pack.ads: New file.
Tested on x86_64-linux. Support for this in GCC is in the pipeline: see
<https://gcc.gnu.org/ml/gcc-patches/2015-07/msg02166.html>.
296 lines
8.2 KiB
C
296 lines
8.2 KiB
C
/* Build symbol tables in GDB's internal format.
|
||
Copyright (C) 1986-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#if !defined (BUILDSYM_H)
|
||
#define BUILDSYM_H 1
|
||
|
||
struct objfile;
|
||
struct symbol;
|
||
struct addrmap;
|
||
struct compunit_symtab;
|
||
|
||
/* This module provides definitions used for creating and adding to
|
||
the symbol table. These routines are called from various symbol-
|
||
file-reading routines.
|
||
|
||
They originated in dbxread.c of gdb-4.2, and were split out to
|
||
make xcoffread.c more maintainable by sharing code.
|
||
|
||
Variables declared in this file can be defined by #define-ing the
|
||
name EXTERN to null. It is used to declare variables that are
|
||
normally extern, but which get defined in a single module using
|
||
this technique. */
|
||
|
||
struct block;
|
||
struct pending_block;
|
||
|
||
#ifndef EXTERN
|
||
#define EXTERN extern
|
||
#endif
|
||
|
||
#define HASHSIZE 127 /* Size of things hashed via
|
||
hashname(). */
|
||
|
||
/* 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. */
|
||
|
||
EXTERN CORE_ADDR last_source_start_addr;
|
||
|
||
/* The list of sub-source-files within the current individual
|
||
compilation. Each file gets its own symtab with its own linetable
|
||
and associated info, but they all share one blockvector. */
|
||
|
||
struct subfile
|
||
{
|
||
struct subfile *next;
|
||
/* Space for this is malloc'd. */
|
||
char *name;
|
||
/* Space for this is malloc'd. */
|
||
struct linetable *line_vector;
|
||
int line_vector_length;
|
||
/* The "containing" compunit. */
|
||
struct buildsym_compunit *buildsym_compunit;
|
||
enum language language;
|
||
struct symtab *symtab;
|
||
};
|
||
|
||
EXTERN struct subfile *current_subfile;
|
||
|
||
/* Global variable which, when set, indicates that we are processing a
|
||
.o file compiled with gcc */
|
||
|
||
EXTERN unsigned char processing_gcc_compilation;
|
||
|
||
/* When set, we are processing a .o file compiled by sun acc. This is
|
||
misnamed; it refers to all stabs-in-elf implementations which use
|
||
N_UNDF the way Sun does, including Solaris gcc. Hopefully all
|
||
stabs-in-elf implementations ever invented will choose to be
|
||
compatible. */
|
||
|
||
EXTERN unsigned char processing_acc_compilation;
|
||
|
||
/* Count symbols as they are processed, for error messages. */
|
||
|
||
EXTERN unsigned int symnum;
|
||
|
||
/* Record the symbols defined for each context in a list. We don't
|
||
create a struct block for the context until we know how long to
|
||
make it. */
|
||
|
||
#define PENDINGSIZE 100
|
||
|
||
struct pending
|
||
{
|
||
struct pending *next;
|
||
int nsyms;
|
||
struct symbol *symbol[PENDINGSIZE];
|
||
};
|
||
|
||
/* Here are the three lists that symbols are put on. */
|
||
|
||
/* static at top level, and types */
|
||
|
||
EXTERN struct pending *file_symbols;
|
||
|
||
/* global functions and variables */
|
||
|
||
EXTERN struct pending *global_symbols;
|
||
|
||
/* everything local to lexical context */
|
||
|
||
EXTERN struct pending *local_symbols;
|
||
|
||
/* "using" directives local to lexical context. */
|
||
|
||
EXTERN struct using_direct *local_using_directives;
|
||
|
||
/* global "using" directives. */
|
||
|
||
EXTERN struct using_direct *global_using_directives;
|
||
|
||
/* Stack representing unclosed lexical contexts (that will become
|
||
blocks, eventually). */
|
||
|
||
struct context_stack
|
||
{
|
||
/* Outer locals at the time we entered */
|
||
|
||
struct pending *locals;
|
||
|
||
/* Pending using directives at the time we entered. */
|
||
|
||
struct using_direct *local_using_directives;
|
||
|
||
/* Pointer into blocklist as of entry */
|
||
|
||
struct pending_block *old_blocks;
|
||
|
||
/* Name of function, if any, defining context */
|
||
|
||
struct symbol *name;
|
||
|
||
/* PC where this context starts */
|
||
|
||
CORE_ADDR start_addr;
|
||
|
||
/* Temp slot for exception handling. */
|
||
|
||
CORE_ADDR end_addr;
|
||
|
||
/* For error-checking matching push/pop */
|
||
|
||
int depth;
|
||
|
||
};
|
||
|
||
EXTERN struct context_stack *context_stack;
|
||
|
||
/* Index of first unused entry in context stack. */
|
||
|
||
EXTERN int context_stack_depth;
|
||
|
||
/* Currently allocated size of context stack. */
|
||
|
||
EXTERN int context_stack_size;
|
||
|
||
/* Non-zero if the context stack is empty. */
|
||
#define outermost_context_p() (context_stack_depth == 0)
|
||
|
||
/* Nonzero if within a function (so symbols should be local, if
|
||
nothing says specifically). */
|
||
|
||
EXTERN int within_function;
|
||
|
||
/* The type of the record_line function. */
|
||
typedef void (record_line_ftype) (struct subfile *subfile, int line,
|
||
CORE_ADDR pc);
|
||
|
||
|
||
|
||
#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile)
|
||
|
||
/* Function to invoke get the next symbol. Return the symbol name. */
|
||
|
||
EXTERN char *(*next_symbol_text_func) (struct objfile *);
|
||
|
||
extern void add_symbol_to_list (struct symbol *symbol,
|
||
struct pending **listhead);
|
||
|
||
extern struct symbol *find_symbol_in_list (struct pending *list,
|
||
char *name, int length);
|
||
|
||
extern struct block *finish_block (struct symbol *symbol,
|
||
struct pending **listhead,
|
||
struct pending_block *old_blocks,
|
||
CORE_ADDR start, CORE_ADDR end);
|
||
|
||
extern void record_block_range (struct block *,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive);
|
||
|
||
extern void really_free_pendings (void *dummy);
|
||
|
||
extern void start_subfile (const char *name);
|
||
|
||
extern void patch_subfile_names (struct subfile *subfile, char *name);
|
||
|
||
extern void push_subfile (void);
|
||
|
||
extern char *pop_subfile (void);
|
||
|
||
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);
|
||
|
||
/* Defined in stabsread.c. */
|
||
|
||
extern void scan_file_globals (struct objfile *objfile);
|
||
|
||
extern void buildsym_new_init (void);
|
||
|
||
extern void buildsym_init (void);
|
||
|
||
extern struct context_stack *push_context (int desc, CORE_ADDR valu);
|
||
|
||
extern struct context_stack *pop_context (void);
|
||
|
||
extern record_line_ftype record_line;
|
||
|
||
extern struct compunit_symtab *start_symtab (struct objfile *objfile,
|
||
const char *name,
|
||
const char *comp_dir,
|
||
CORE_ADDR start_addr);
|
||
|
||
extern void restart_symtab (struct compunit_symtab *cust,
|
||
const char *name, CORE_ADDR start_addr);
|
||
|
||
extern int hashname (const char *name);
|
||
|
||
extern void free_pending_blocks (void);
|
||
|
||
/* Record the name of the debug format in the current pending symbol
|
||
table. FORMAT must be a string with a lifetime at least as long as
|
||
the symtab's objfile. */
|
||
|
||
extern void record_debugformat (const char *format);
|
||
|
||
/* Record the name of the debuginfo producer (usually the compiler) in
|
||
the current pending symbol table. PRODUCER must be a string with a
|
||
lifetime at least as long as the symtab's objfile. */
|
||
|
||
extern void record_producer (const char *producer);
|
||
|
||
extern void merge_symbol_lists (struct pending **srclist,
|
||
struct pending **targetlist);
|
||
|
||
/* Set the name of the last source file. NAME is copied by this
|
||
function. */
|
||
|
||
extern void set_last_source_file (const char *name);
|
||
|
||
/* Fetch the name of the last source file. */
|
||
|
||
extern const char *get_last_source_file (void);
|
||
|
||
/* Return the compunit symtab object.
|
||
It is only valid to call this between calls to start_symtab and the
|
||
end_symtab* functions. */
|
||
|
||
extern struct compunit_symtab *buildsym_compunit_symtab (void);
|
||
|
||
/* Return the macro table.
|
||
Initialize it if this is the first use.
|
||
It is only valid to call this between calls to start_symtab and the
|
||
end_symtab* functions. */
|
||
|
||
extern struct macro_table *get_macro_table (void);
|
||
|
||
#undef EXTERN
|
||
|
||
#endif /* defined (BUILDSYM_H) */
|