aboutsummaryrefslogtreecommitdiff
path: root/gdb/unittests
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2020-04-23 07:19:43 -0600
committerTom Tromey <tromey@adacore.com>2020-04-23 07:19:43 -0600
commitecc6c6066b5cdd4663413e0bd6ef8deea1a8c889 (patch)
tree0f829dc788e3e9b9ac05695d53408c624722aed1 /gdb/unittests
parent740480b88afd4f2b01d117525f534ddce28530f3 (diff)
downloadgdb-ecc6c6066b5cdd4663413e0bd6ef8deea1a8c889.zip
gdb-ecc6c6066b5cdd4663413e0bd6ef8deea1a8c889.tar.gz
gdb-ecc6c6066b5cdd4663413e0bd6ef8deea1a8c889.tar.bz2
Fix Ada crash with .debug_names
PR ada/25837 points out a crash in the gdb testsuite when .debug_names is used. You can reproduce like: runtest --target_board=cc-with-debug-names \ gdb.ada/big_packed_array.exp The bug was introduced by commit e0802d599 ("Avoid copying in lookup_name_info"). The problem is that the return type of language_lookup_name changed, but in a way that didn't cause existing callers to trigger a compilation error. Previously, it returned a "const string &", but after it returned a "const char *". This caused a string to be created in dw2_expand_symtabs_matching_symbol, but one that had too short of a lifetime; so eventually the matcher cache would wind up with invalid data. This patch fixes the problem by updating the callers to use the new type. Tested on x86-64 Fedora 30. gdb/ChangeLog 2020-04-23 Tom Tromey <tromey@adacore.com> PR ada/25837: * dwarf2/read.c (dw2_expand_symtabs_matching_symbol): Store a "const char *", not a "const std::string &". <name_and_matcher::operator==>: Update. * unittests/lookup_name_info-selftests.c: Change type of "result".
Diffstat (limited to 'gdb/unittests')
-rw-r--r--gdb/unittests/lookup_name_info-selftests.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/unittests/lookup_name_info-selftests.c b/gdb/unittests/lookup_name_info-selftests.c
index 002fc69..6a61752 100644
--- a/gdb/unittests/lookup_name_info-selftests.c
+++ b/gdb/unittests/lookup_name_info-selftests.c
@@ -37,14 +37,14 @@ check_make_paramless (const char *file, int line,
{
lookup_name_info lookup_name (name, symbol_name_match_type::FULL,
completion_mode, true /* ignore_parameters */);
- const std::string &result = lookup_name.language_lookup_name (lang);
+ const char *result = lookup_name.language_lookup_name (lang);
- if (result != expected)
+ if (strcmp (result, expected) != 0)
{
error (_("%s:%d: make-paramless self-test failed: (completion=%d, lang=%d) "
"\"%s\" -> \"%s\", expected \"%s\""),
file, line, completion_mode, lang, name,
- result.c_str (), expected);
+ result, expected);
}
}