* [commit/Ada] gdb.ada/complete.exp failure on x86_64-windows
@ 2014-11-14 16:49 Joel Brobecker
2014-11-19 8:51 ` pushed: " Joel Brobecker
0 siblings, 1 reply; 2+ messages in thread
From: Joel Brobecker @ 2014-11-14 16:49 UTC (permalink / raw)
To: gdb-patches
Hello,
Using the example in gdb.ada/complete.exp, the following command
on x86_64-windows returns one unwanted completion choice :
(gdb) complete p pck
p <pck_E>>
[all following completions entries snipped, all expected]
I tracked down this suprising entry to a minimal symbol whose name
is ".refptr.pck_E". The problem occurs while trying to see if
this symbol matches "pck" when doing wild-matching as we are doing
here:
/* Second: Try wild matching... */
if (!match && wild_match_p)
{
/* Since we are doing wild matching, this means that TEXT
may represent an unqualified symbol name. We therefore must
also compare TEXT against the unqualified name of the symbol. */
sym_name = ada_unqualified_name (ada_decode (sym_name));
if (strncmp (sym_name, text, text_len) == 0)
match = 1;
}
What happens is that ada_decode correctly identifies the fact that
SYM_NAME (".refptr.pck_E") is not following any GNAT encoding, and
therefore returns that same name, but bracketed: "<.refptr.pck_E>".
This is the convention we use for telling GDB that the decoded name
is not a real Ada name - and therefore should not be encoded for
operations such as name matching, symbol lookups, etc. So far, so good.
Next is the call to ada_unqualified_name, which unfortunately does
not notice that the decoded name it is being given isn't a natural
symbol, and just blindly strips everything up to the last do, returning
"pck_E>". And of course, "pck_E>" matches "pck" now, and so we end
up accepting this symbol as a match.
This patch fixes the problem by making ada_unqualified_name a little
smarter by making sure that the given decoded symbol name does not
start with '<'.
gdb/ChangeLog:
* ada-lang.c (ada_unqualified_name): Return DECODED_NAME if
it starts with '<'.
Tested on x86_64-windows using AdaCore's testsuite as well as
on x86_64-linux.
I will push the patch sometime next week, unless there are any
comments.
Thanks,
--
Joel
---
gdb/ada-lang.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index b576839..86195e8 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -523,8 +523,16 @@ ada_typedef_target_type (struct type *type)
static const char *
ada_unqualified_name (const char *decoded_name)
{
- const char *result = strrchr (decoded_name, '.');
+ const char *result;
+
+ /* If the decoded name starts with '<', it means that the encoded
+ name does not follow standard naming conventions, and thus that
+ it is not your typical Ada symbol name. Trying to unqualify it
+ is therefore pointless and possibly erroneous. */
+ if (decoded_name[0] == '<')
+ return decoded_name;
+ result = strrchr (decoded_name, '.');
if (result != NULL)
result++; /* Skip the dot... */
else
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* pushed: [commit/Ada] gdb.ada/complete.exp failure on x86_64-windows
2014-11-14 16:49 [commit/Ada] gdb.ada/complete.exp failure on x86_64-windows Joel Brobecker
@ 2014-11-19 8:51 ` Joel Brobecker
0 siblings, 0 replies; 2+ messages in thread
From: Joel Brobecker @ 2014-11-19 8:51 UTC (permalink / raw)
To: gdb-patches
> gdb/ChangeLog:
>
> * ada-lang.c (ada_unqualified_name): Return DECODED_NAME if
> it starts with '<'.
Pushed!
Thank you,
--
Joel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-19 8:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-14 16:49 [commit/Ada] gdb.ada/complete.exp failure on x86_64-windows Joel Brobecker
2014-11-19 8:51 ` pushed: " Joel Brobecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).