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

Fix regression in Ada do_full_match

Browse Source 
An earlier patch to ada-lang.c:do_full_match introduced a subtle
change to the semantics.  The previous code did:

    -  if (strncmp (sym_name, search_name, search_name_len) == 0
    -      && is_name_suffix (sym_name + search_name_len))
    -    return true;
    -
    -  if (startswith (sym_name, "_ada_")

whereas the new code unconditionally skips a leading "_ada_".

The difference occurs if the lookup name itself starts with "_ada_".
In this case, the symbol won't match.

Normally this doesn't seem to be a problem.  However, it caused a
regression on one particular (internal) test case on one particular
platform.

This patch changes the code to handle this case.  I don't know how to
write a reliable test case for this, so no test is included.

2021-01-07  Tom Tromey  <tromey@adacore.com>

	* ada-lang.c (do_full_match): Conditionally skip "_ada_" prefix.
This commit is contained in:
Tom Tromey
2021-01-07 07:02:46 -07:00
parent dc20061339
commit 959d6a673e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ada-lang.c
View File

@ -13572,10 +13572,16 @@ do_full_match (const char *symbol_search_name,
const lookup_name_info &lookup_name,
completion_match_result *comp_match_res)
{
if (startswith (symbol_search_name, "_ada_"))
const char *lname = lookup_name.ada ().lookup_name ().c_str ();
/* If both symbols start with "_ada_", just let the loop below
handle the comparison. However, if only the symbol name starts
with "_ada_", skip the prefix and let the match proceed as
usual. */
if (startswith (symbol_search_name, "_ada_")
&& !startswith (lname, "_ada"))
symbol_search_name += 5;
const char *lname = lookup_name.ada ().lookup_name ().c_str ();
int uscore_count = 0;
while (*lname != '\0')
{