Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[python/Ada] gdb.lookup_type fails to looking primitive type

Browse Source 
The following change...

    commit 1994afbf19
    Date:   Tue Dec 23 07:55:39 2014 -0800
    Subject: Look up primitive types as symbols.

... caused the following regression:

    % gdb
    (gdb) set lang ada
    (gdb) python print gdb.lookup_type('character')
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
    gdb.error: No type named character.
    Error while executing Python code.

This is because the language_lookup_primitive_type_as_symbol call
was moved to the la_lookup_symbol_nonlocal hook. A couple of
implementations have been upated accordingly, but the Ada version
has not. This patch fixes this omission.

gdb/ChangeLog:

        * ada-lang.c (ada_lookup_symbol_nonlocal): If name not found
        in static block, then try searching for primitive types.

gdb/testsuite/ChangeLog:

        * gdb.python/py-lookup-type.exp: New file.
This commit is contained in:
Joel Brobecker
2015-01-12 15:46:34 +04:00
parent 15eec7902f
commit 04dccad086
4 changed files with 100 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gdb/ada-lang.c
View File

@@ -5598,7 +5598,38 @@ ada_lookup_symbol_nonlocal (const struct language_defn *langdef,
const struct block *block,
const domain_enum domain)
{
return ada_lookup_symbol (name, block_static_block (block), domain, NULL);
struct symbol *sym;
sym = ada_lookup_symbol (name, block_static_block (block), domain, NULL);
if (sym != NULL)
return sym;
/* If we haven't found a match at this point, try the primitive
types. In other languages, this search is performed before
searching for global symbols in order to short-circuit that
global-symbol search if it happens that the name corresponds
to a primitive type. But we cannot do the same in Ada, because
it is perfectly legitimate for a program to declare a type which
has the same name as a standard type. If looking up a type in
that situation, we have traditionally ignored the primitive type
in favor of user-defined types. This is why, unlike most other
languages, we search the primitive types this late and only after
having searched the global symbols without success. */
if (domain == VAR_DOMAIN)
{
struct gdbarch *gdbarch;
if (block == NULL)
gdbarch = target_gdbarch ();
else
gdbarch = block_gdbarch (block);
sym = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
if (sym != NULL)
return sym;
}
return NULL;
}