espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 06:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* valops.c (value_of_this): Use lookup_language_this.

Browse Source 
* symtab.h (lookup_language_this): Declare.
	* symtab.c (lookup_language_this): New function.
	(lookup_symbol_aux): Use lookup_language_this.
	* ax-gdb.c (gen_expr) <OP_THIS>: Use lookup_language_this.
This commit is contained in:
Tom Tromey
2011-06-17 20:46:47 +00:00
parent 7518bff55a
commit 66a17cb629
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gdb/symtab.c
View File

@ -1090,6 +1090,29 @@ lookup_symbol (const char *name, const struct block *block,
is_a_field_of_this);
}
/* Look up the `this' symbol for LANG in BLOCK. Return the symbol if
found, or NULL if not found. */
struct symbol *
lookup_language_this (const struct language_defn *lang,
const struct block *block)
{
if (lang->la_name_of_this == NULL || block == NULL)
return NULL;
while (1)
{
struct symbol *sym;
sym = lookup_block_symbol (block, lang->la_name_of_this, VAR_DOMAIN);
if (sym != NULL)
return sym;
if (BLOCK_FUNCTION (block))
return NULL;
block = BLOCK_SUPERBLOCK (block);
}
}
/* Behave like lookup_symbol except that NAME is the natural name
of the symbol that we're looking for and, if LINKAGE_NAME is
non-NULL, ensure that the symbol's linkage name matches as
@ -1123,20 +1146,10 @@ lookup_symbol_aux (const char *name, const struct block *block,
langdef = language_def (language);
if (langdef->la_name_of_this != NULL && is_a_field_of_this != NULL
&& block != NULL)
if (is_a_field_of_this != NULL)
{
struct symbol *sym = NULL;
const struct block *function_block = block;
struct symbol *sym = lookup_language_this (langdef, block);
/* 'this' is only defined in the function's block, so find the
enclosing function block. */
for (; function_block && !BLOCK_FUNCTION (function_block);
function_block = BLOCK_SUPERBLOCK (function_block));
if (function_block && !dict_empty (BLOCK_DICT (function_block)))
sym = lookup_block_symbol (function_block, langdef->la_name_of_this,
VAR_DOMAIN);
if (sym)
{
struct type *t = sym->type;