mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
c62446b12b
A few places in the completion code look for a "(" to find a
function's parameter list, in order to strip it, because psymtabs (and
gdb index) don't include parameter info in the symbol names.
See compare_symbol_name and
default_collect_symbol_completion_matches_break_on.
This is too naive. Consider:
ns_overload2_test::([TAB]
We'd want to complete that to:
ns_overload2_test::(anonymous namespace)::struct_overload2_test
Or:
b (anonymous namespace)::[TAB]
That currently completes to:
b (anonymous namespace)
Which is obviously broken. This patch makes that work.
Also, the current compare_symbol_name hack means that while this
works:
"b function([TAB]" -> "b function()"
This does not:
"b function ([TAB]"
This patch fixes that. Whitespace "ignoring" now Just Works, i.e.,
assuming a symbol named "function(int, long)", this:
b function ( int , lon[TAB]
completes to:
b function ( int , long)
To address all of this, this patch builds on top of the rest of the
series, and pushes the responsibility of stripping parameters from a
lookup name to the new lookup_name_info object, where we can apply
per-language rules. Also note that we now only make a version of the
lookup name with parameters stripped out where it's actually required
to do that, in the psymtab and GDB index code.
For C++, the right way to strip parameters is with "cp_remove_params",
which uses a real parser (cp-name-parser.y) to split the name into a
component tree and then discards parameters.
The trouble for completion is that in that case we have an incomplete
name, like "foo::func(int" and thus cp_remove_params throws an error.
This patch sorts that by adding a cp_remove_params_if_any variant of
cp_remove_params that tries removing characters from the end of the
string until cp_remove_params works. So cp_remove_params_if_any
behaves like this:
With a complete name:
"foo::func(int)" => foo::func(int) # cp_remove_params_1 succeeds the first time.
With an incomplete name:
"foo::func(int" => NULL # cp_remove_params fails the first time.
"foo::func(in" => NULL # and again...
"foo::func(i" => NULL # and again...
"foo::func(" => NULL # and again...
"foo::func" => "foo::func" # success!
Note that even if this approach removes significant rightmost
characters, it's still OK, because this parameter stripping is only
necessary for psymtabs and gdb index, where we're determining whether
to expand a symbol table. Say cp_remove_params_if_any returned
"foo::" above for "foo::func(int". That'd cause us to expand more
symtabs than ideal (because we'd expand all symtabs with symbols that
start with "foo::", not just "foo::func"), but then when we actually
look for completion matches, we'd still use the original lookup name,
with parameter information ["foo::func(int"], and thus we'll return no
false positive to the user. Whether the stripping works as intended
and doesn't strip too much is thus covered by a unit test instead of a
testsuite test.
The "if_any" part of the name refers to the fact that while
cp_remove_params returns NULL if the input name has no parameters in
the first place, like:
"foo::func" => NULL # cp_remove_params
cp_remove_params_if_any still returns the function name:
"foo::func" => "foo::func" # cp_remove_params_if_any
gdb/ChangeLog:
2017-11-08 Pedro Alves <palves@redhat.com>
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
unittests/lookup_name_info-selftests.c.
(SUBDIR_UNITTESTS_OBS): Add lookup_name_info-selftests.o.
* cp-support.c: Include "selftest.h".
(cp_remove_params_1): Rename from cp_remove_params. Add
'require_param' parameter, and handle it.
(cp_remove_params): Reimplement.
(cp_remove_params_if_any): New.
(selftests::quote): New.
(selftests::check_remove_params): New.
(selftests::test_cp_remove_params): New.
(_initialize_cp_support): Install
selftests::test_cp_remove_params.
* cp-support.h (cp_remove_params_if_any): Declare.
* dwarf2read.c :Include "selftest.h".
(dw2_expand_symtabs_matching_symbol): Use
lookup_name_info::make_ignore_params.
(selftests::dw2_expand_symtabs_matching::mock_mapped_index)
(selftests::dw2_expand_symtabs_matching::string_or_null)
(selftests::dw2_expand_symtabs_matching::check_match)
(selftests::dw2_expand_symtabs_matching::test_symbols)
(selftests::dw2_expand_symtabs_matching::run_test): New.
(_initialize_dwarf2_read): Register
selftests::dw2_expand_symtabs_matching::run_test.
* psymtab.c (psym_expand_symtabs_matching): Use
lookup_name_info::make_ignore_params.
* symtab.c (demangle_for_lookup_info::demangle_for_lookup_info):
If the lookup name wants to ignore parameters, strip them.
(compare_symbol_name): Remove sym_text/sym_text_len parameters and
code handling '('.
(completion_list_add_name): Don't pass down sym_text/sym_text_len.
(default_collect_symbol_completion_matches_break_on): Don't try to
strip parameters.
* symtab.h (lookup_name_info::lookup_name_info): Add
'ignore_parameters' parameter.
(lookup_name_info::ignore_parameters)
(lookup_name_info::make_ignore_params): New methods.
(lookup_name_info::m_ignore_parameters): New field.
* unittests/lookup_name_info-selftests.c: New file.
112 lines
3.9 KiB
C
112 lines
3.9 KiB
C
/* Self tests for lookup_name_info for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "selftest.h"
|
|
#include "symtab.h"
|
|
|
|
namespace selftests {
|
|
namespace lookup_name {
|
|
|
|
/* Check that removing parameter info out of NAME produces EXPECTED.
|
|
COMPLETION_MODE indicates whether we're testing normal and
|
|
completion mode. FILE and LINE are used to provide better test
|
|
location information in case the check fails. */
|
|
|
|
static void
|
|
check_make_paramless (const char *file, int line,
|
|
enum language lang,
|
|
const char *name, const char *expected,
|
|
bool completion_mode)
|
|
{
|
|
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);
|
|
|
|
if (result != expected)
|
|
{
|
|
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);
|
|
}
|
|
}
|
|
|
|
static void
|
|
run_tests ()
|
|
{
|
|
/* Helper for CHECK and CHECK_INCOMPL. */
|
|
#define CHECK_1(INCOMPLETE, LANG, NAME, EXPECTED) \
|
|
do \
|
|
{ \
|
|
check_make_paramless (__FILE__, __LINE__, \
|
|
LANG, NAME, \
|
|
(INCOMPLETE) ? "" : (EXPECTED), false); \
|
|
check_make_paramless (__FILE__, __LINE__, \
|
|
LANG, NAME, EXPECTED, true); \
|
|
} \
|
|
while (0)
|
|
|
|
/* Check that removing parameter info out of NAME produces EXPECTED.
|
|
Checks both normal and completion modes. */
|
|
#define CHECK(LANG, NAME, EXPECTED) \
|
|
CHECK_1(false, LANG, NAME, EXPECTED)
|
|
|
|
/* Similar, but used when NAME is incomplete -- i.e., NAME has
|
|
unbalanced parentheses. In this case, looking for the exact name
|
|
should fail / return empty. */
|
|
#define CHECK_INCOMPL(LANG, NAME, EXPECTED) \
|
|
CHECK_1 (true, LANG, NAME, EXPECTED)
|
|
|
|
/* None of these languages support function overloading like C++
|
|
does, so building a nameless lookup name ends up being just the
|
|
same as any other lookup name. Mainly this serves as smoke test
|
|
that C++-specific code doesn't mess up with other languages that
|
|
use some other scoping character ('.' vs '::'). */
|
|
CHECK (language_ada, "pck.ada_hello", "pck__ada_hello");
|
|
CHECK (language_go, "pck.go_hello", "pck.go_hello");
|
|
CHECK (language_fortran, "mod::func", "mod::func");
|
|
|
|
/* D does support function overloading similar to C++, but we're
|
|
missing support for stripping parameters. At least make sure the
|
|
input name is preserved unmodified. */
|
|
CHECK (language_d, "pck.d_hello", "pck.d_hello");
|
|
|
|
/* Just a few basic tests to make sure
|
|
lookup_name_info::make_paramless is well integrated with
|
|
cp_remove_params_if_any. gdb/cp-support.c has comprehensive
|
|
testing of C++ specifics. */
|
|
CHECK (language_cplus, "function()", "function");
|
|
CHECK (language_cplus, "function() const", "function");
|
|
CHECK (language_cplus, "A::B::C()", "A::B::C");
|
|
CHECK (language_cplus, "A::B::C", "A::B::C");
|
|
|
|
#undef CHECK
|
|
#undef CHECK_INCOMPL
|
|
}
|
|
|
|
}} // namespace selftests::lookup_name
|
|
|
|
void
|
|
_initialize_lookup_name_info_selftests ()
|
|
{
|
|
selftests::register_test ("lookup_name_info",
|
|
selftests::lookup_name::run_tests);
|
|
}
|