[python/Ada] gdb.lookup_type fails to looking primitive type
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:
parent
15eec7902f
commit
04dccad086
|
@ -1,3 +1,8 @@
|
|||
2015-01-13 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* ada-lang.c (ada_lookup_symbol_nonlocal): If name not found
|
||||
in static block, then try searching for primitive types.
|
||||
|
||||
2015-01-12 Patrick Palka <patrick@parcs.ath.cx>
|
||||
|
||||
* top.h (gdb_add_history): Declare.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
2015-01-13 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* gdb.python/py-lookup-type.exp: New file.
|
||||
|
||||
2015-01-12 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* gdb.python/py-prompt.exp: When the board can't spawn for attach,
|
||||
|
|
|
@ -0,0 +1,59 @@
|
|||
# Copyright (C) 2015 Free Software Foundation, Inc.
|
||||
|
||||
# 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/>.
|
||||
|
||||
# This file is part of the GDB testsuite. It tests the mechanism
|
||||
# of exposing types to Python.
|
||||
|
||||
load_lib gdb-python.exp
|
||||
|
||||
# Note that the purpose of this testcase is to test the behavior
|
||||
# of gdb.lookup_type searching for the primitive types internally
|
||||
# created by each language since GDB. So, we must start GDB without
|
||||
# loading any symbol in.
|
||||
|
||||
gdb_exit
|
||||
gdb_start
|
||||
gdb_reinitialize_dir $srcdir/$subdir
|
||||
|
||||
# Skip all tests if Python scripting is not enabled.
|
||||
if { [skip_python_tests] } { continue }
|
||||
|
||||
proc test_lookup_type { lang type_name } {
|
||||
gdb_test_no_output "set language ${lang}"
|
||||
gdb_test_no_output "python gdb.lookup_type('${type_name}')" \
|
||||
"lookup type ${type_name} using language ${lang}"
|
||||
}
|
||||
|
||||
test_lookup_type "ada" "character"
|
||||
|
||||
test_lookup_type "c" "char"
|
||||
|
||||
test_lookup_type "d" "ucent"
|
||||
|
||||
test_lookup_type "fortran" "character"
|
||||
|
||||
test_lookup_type "go" "int32"
|
||||
|
||||
test_lookup_type "java" "byte"
|
||||
|
||||
test_lookup_type "modula-2" "CARDINAL"
|
||||
|
||||
test_lookup_type "opencl" "ushort"
|
||||
|
||||
test_lookup_type "objective-c" "char"
|
||||
|
||||
test_lookup_type "opencl" "ushort"
|
||||
|
||||
test_lookup_type "pascal" "char"
|
Loading…
Reference in New Issue