wrong value returned by ada-lang.c:compare_names
The ada-lang.c:compare_names function returns the wrong value when the first string starts with the same contents as the second string, followed by '_' and then some characters that do not make a symbol name suffix. For instance: string1 = "generics__test_generics__instance__print" string2 = "generics__test_generics" In that case, compare_names (string1, string2) return -1, when clearly, string1 is greater than string2. A consequence of this problem is that GDB may fail to lookup "generics.test_generics" from our partial symtabs, because partial symbols are ordered by strcmp_iw_ordered: (gdb) b generics.test_generics Function "generics.test_generics" not defined. Make breakpoint pending on future shared library load? (y or [n]) gdb/ChangeLog: * ada-lang.c (compare_names): Fix wrong return value in case string1 starts with the same contents as string2, followed by an underscore that do not start a symbol name suffix. gdb/testsuite/ChangeLog: * gdb.ada/fullname_bp: New testcase.
This commit is contained in:
parent
8ee00506e1
commit
1a1d551388
9 changed files with 163 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2011-11-28 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
|
* ada-lang.c (compare_names): Fix wrong return value in case
|
||||||
|
string1 starts with the same contents as string2, followed
|
||||||
|
by an underscore that do not start a symbol name suffix.
|
||||||
|
|
||||||
2011-11-28 Phil Muldoon <pmuldoon@redhat.com>
|
2011-11-28 Phil Muldoon <pmuldoon@redhat.com>
|
||||||
|
|
||||||
PR python/13369
|
PR python/13369
|
||||||
|
|
|
@ -4894,7 +4894,7 @@ compare_names (const char *string1, const char *string2)
|
||||||
if (is_name_suffix (string1))
|
if (is_name_suffix (string1))
|
||||||
return 0;
|
return 0;
|
||||||
else
|
else
|
||||||
return -1;
|
return 1;
|
||||||
}
|
}
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2011-11-28 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
|
* gdb.ada/fullname_bp: New testcase.
|
||||||
|
|
||||||
2011-11-25 Jan Kratochvil <jan.kratochvil@redhat.com>
|
2011-11-25 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||||
|
|
||||||
PR testsuite/12649
|
PR testsuite/12649
|
||||||
|
|
34
gdb/testsuite/gdb.ada/fullname_bp.exp
Normal file
34
gdb/testsuite/gdb.ada/fullname_bp.exp
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
# Copyright 2011 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/>.
|
||||||
|
|
||||||
|
load_lib "ada.exp"
|
||||||
|
|
||||||
|
set testdir "fullname_bp"
|
||||||
|
set testfile "${testdir}/foo"
|
||||||
|
set srcfile ${srcdir}/${subdir}/${testfile}.adb
|
||||||
|
set binfile ${objdir}/${subdir}/${testfile}
|
||||||
|
|
||||||
|
file mkdir ${objdir}/${subdir}/${testdir}
|
||||||
|
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_restart ${testfile}
|
||||||
|
|
||||||
|
# Break on "pck.hello" rather than just "hello" to make sure we trigger
|
||||||
|
# the non-wild symbol lookup.
|
||||||
|
gdb_test "break pck.hello" \
|
||||||
|
"Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
|
||||||
|
|
21
gdb/testsuite/gdb.ada/fullname_bp/dn.adb
Normal file
21
gdb/testsuite/gdb.ada/fullname_bp/dn.adb
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
-- Copyright 2011 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/>.
|
||||||
|
|
||||||
|
package body Dn is
|
||||||
|
procedure Do_Nothing (A : System.Address) is
|
||||||
|
begin
|
||||||
|
null;
|
||||||
|
end Do_Nothing;
|
||||||
|
end Dn;
|
19
gdb/testsuite/gdb.ada/fullname_bp/dn.ads
Normal file
19
gdb/testsuite/gdb.ada/fullname_bp/dn.ads
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
-- Copyright 2011 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/>.
|
||||||
|
|
||||||
|
with System;
|
||||||
|
package Dn is
|
||||||
|
procedure Do_Nothing (A : System.Address);
|
||||||
|
end Dn;
|
21
gdb/testsuite/gdb.ada/fullname_bp/foo.adb
Normal file
21
gdb/testsuite/gdb.ada/fullname_bp/foo.adb
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
-- Copyright 2011 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/>.
|
||||||
|
|
||||||
|
with Pck; use Pck;
|
||||||
|
procedure Foo is
|
||||||
|
begin
|
||||||
|
Hello;
|
||||||
|
There;
|
||||||
|
end Foo;
|
35
gdb/testsuite/gdb.ada/fullname_bp/pck.adb
Normal file
35
gdb/testsuite/gdb.ada/fullname_bp/pck.adb
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
-- Copyright 2011 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/>.
|
||||||
|
|
||||||
|
with Dn; use Dn;
|
||||||
|
|
||||||
|
package body Pck is
|
||||||
|
procedure Hello is
|
||||||
|
procedure Nested is
|
||||||
|
I : Integer := 0;
|
||||||
|
begin
|
||||||
|
Do_Nothing (I'Address);
|
||||||
|
end Nested;
|
||||||
|
begin
|
||||||
|
Nested;
|
||||||
|
end Hello;
|
||||||
|
|
||||||
|
procedure There is
|
||||||
|
begin
|
||||||
|
null;
|
||||||
|
end There;
|
||||||
|
end Pck;
|
||||||
|
|
||||||
|
|
22
gdb/testsuite/gdb.ada/fullname_bp/pck.ads
Normal file
22
gdb/testsuite/gdb.ada/fullname_bp/pck.ads
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
-- Copyright 2011 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/>.
|
||||||
|
|
||||||
|
package Pck is
|
||||||
|
procedure Hello;
|
||||||
|
procedure There;
|
||||||
|
-- The name of that procedure needs to be greater (in terms
|
||||||
|
-- of alphabetical order) than the name of the procedure above.
|
||||||
|
end Pck;
|
||||||
|
|
Loading…
Reference in a new issue