/* Helper routines for C++ support in GDB.
- Copyright (C) 2003-2014 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
Contributed by David Carlton and by Kealia, Inc.
#include "frame.h"
#include "buildsym.h"
#include "language.h"
+#include "namespace.h"
+#include <string>
+
+static struct block_symbol
+ cp_lookup_nested_symbol_1 (struct type *container_type,
+ const char *nested_name,
+ const char *concatenated_name,
+ const struct block *block,
+ const domain_enum domain,
+ int basic_lookup, int is_in_anonymous);
static struct type *cp_lookup_transparent_type_loop (const char *name,
const char *scope,
anonymous namespace; if so, add an appropriate using directive. */
void
-cp_scan_for_anonymous_namespaces (const struct symbol *const symbol,
+cp_scan_for_anonymous_namespaces (struct buildsym_compunit *compunit,
+ const struct symbol *const symbol,
struct objfile *const objfile)
{
- if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
+ if (symbol->demangled_name () != NULL)
{
- const char *name = SYMBOL_DEMANGLED_NAME (symbol);
+ const char *name = symbol->demangled_name ();
unsigned int previous_component;
unsigned int next_component;
? 0 : previous_component - 2);
int src_len = next_component;
- char *dest = alloca (dest_len + 1);
- char *src = alloca (src_len + 1);
+ char *dest = (char *) alloca (dest_len + 1);
+ char *src = (char *) alloca (src_len + 1);
memcpy (dest, name, dest_len);
memcpy (src, name, src_len);
anonymous namespace. So add symbols in it to the
namespace given by the previous component if there is
one, or to the global namespace if there isn't. */
- cp_add_using_directive (dest, src, NULL, NULL, NULL, 1,
- &objfile->objfile_obstack);
+ std::vector<const char *> excludes;
+ add_using_directive (compunit->get_local_using_directives (),
+ dest, src, NULL, NULL, excludes,
+ 1, &objfile->objfile_obstack);
}
/* The "+ 2" is for the "::". */
previous_component = next_component + 2;
}
}
-/* Add a using directive to using_directives. If the using directive
- in question has already been added, don't add it twice.
-
- Create a new struct using_direct which imports the namespace SRC
- into the scope DEST. ALIAS is the name of the imported namespace
- in the current scope. If ALIAS is NULL then the namespace is known
- by its original name. DECLARATION is the name if the imported
- varable if this is a declaration import (Eg. using A::x), otherwise
- it is NULL. EXCLUDES is a list of names not to import from an
- imported module or NULL. If COPY_NAMES is non-zero, then the
- arguments are copied into newly allocated memory so they can be
- temporaries. For EXCLUDES the VEC pointers are copied but the
- pointed to characters are not copied. */
-
-void
-cp_add_using_directive (const char *dest,
- const char *src,
- const char *alias,
- const char *declaration,
- VEC (const_char_ptr) *excludes,
- int copy_names,
- struct obstack *obstack)
-{
- struct using_direct *current;
- struct using_direct *new;
-
- /* Has it already been added? */
-
- for (current = using_directives; current != NULL; current = current->next)
- {
- int ix;
- const char *param;
-
- if (strcmp (current->import_src, src) != 0)
- continue;
- if (strcmp (current->import_dest, dest) != 0)
- continue;
- if ((alias == NULL && current->alias != NULL)
- || (alias != NULL && current->alias == NULL)
- || (alias != NULL && current->alias != NULL
- && strcmp (alias, current->alias) != 0))
- continue;
- if ((declaration == NULL && current->declaration != NULL)
- || (declaration != NULL && current->declaration == NULL)
- || (declaration != NULL && current->declaration != NULL
- && strcmp (declaration, current->declaration) != 0))
- continue;
-
- /* Compare the contents of EXCLUDES. */
- for (ix = 0; VEC_iterate (const_char_ptr, excludes, ix, param); ix++)
- if (current->excludes[ix] == NULL
- || strcmp (param, current->excludes[ix]) != 0)
- break;
- if (ix < VEC_length (const_char_ptr, excludes)
- || current->excludes[ix] != NULL)
- continue;
-
- /* Parameters exactly match CURRENT. */
- return;
- }
-
- new = obstack_alloc (obstack, (sizeof (*new)
- + (VEC_length (const_char_ptr, excludes)
- * sizeof (*new->excludes))));
- memset (new, 0, sizeof (*new));
-
- if (copy_names)
- {
- new->import_src = obstack_copy0 (obstack, src, strlen (src));
- new->import_dest = obstack_copy0 (obstack, dest, strlen (dest));
- }
- else
- {
- new->import_src = src;
- new->import_dest = dest;
- }
-
- if (alias != NULL && copy_names)
- new->alias = obstack_copy0 (obstack, alias, strlen (alias));
- else
- new->alias = alias;
-
- if (declaration != NULL && copy_names)
- new->declaration = obstack_copy0 (obstack,
- declaration, strlen (declaration));
- else
- new->declaration = declaration;
-
- memcpy (new->excludes, VEC_address (const_char_ptr, excludes),
- VEC_length (const_char_ptr, excludes) * sizeof (*new->excludes));
- new->excludes[VEC_length (const_char_ptr, excludes)] = NULL;
-
- new->next = using_directives;
- using_directives = new;
-}
-
/* Test whether or not NAMESPACE looks like it mentions an anonymous
namespace; return nonzero if so. */
!= NULL);
}
-/* Look up NAME in BLOCK's static block and in global blocks. If
- ANONYMOUS_NAMESPACE is nonzero, the symbol in question is located
- within an anonymous namespace. If SEARCH is non-zero, search through
- base classes for a matching symbol. Other arguments are as in
- cp_lookup_symbol_nonlocal. */
+/* Look up NAME in DOMAIN in BLOCK's static block and in global blocks.
+ If IS_IN_ANONYMOUS is nonzero, the symbol in question is located
+ within an anonymous namespace. */
-static struct symbol *
-lookup_symbol_file (const char *name,
- const struct block *block,
- const domain_enum domain,
- int anonymous_namespace, int search)
+static struct block_symbol
+cp_basic_lookup_symbol (const char *name, const struct block *block,
+ const domain_enum domain, int is_in_anonymous)
{
- struct symbol *sym = NULL;
+ struct block_symbol sym;
sym = lookup_symbol_in_static_block (name, block, domain);
- if (sym != NULL)
+ if (sym.symbol != NULL)
return sym;
- if (anonymous_namespace)
+ if (is_in_anonymous)
{
/* Symbols defined in anonymous namespaces have external linkage
but should be treated as local to a single file nonetheless.
const struct block *global_block = block_global_block (block);
if (global_block != NULL)
- sym = lookup_symbol_in_block (name, global_block, domain);
+ {
+ sym.symbol = lookup_symbol_in_block (name,
+ symbol_name_match_type::FULL,
+ global_block, domain);
+ sym.block = global_block;
+ }
}
else
- {
- sym = lookup_global_symbol (name, block, domain);
- }
+ sym = lookup_global_symbol (name, block, domain);
+
+ return sym;
+}
+
+/* Search bare symbol NAME in DOMAIN in BLOCK.
+ NAME is guaranteed to not have any scope (no "::") in its name, though
+ if for example NAME is a template spec then "::" may appear in the
+ argument list.
+ If LANGDEF is non-NULL then try to lookup NAME as a primitive type in
+ that language. Normally we wouldn't need LANGDEF but fortran also uses
+ this code.
+ If SEARCH is non-zero then see if we can determine "this" from BLOCK, and
+ if so then also search for NAME in that class. */
+
+static struct block_symbol
+cp_lookup_bare_symbol (const struct language_defn *langdef,
+ const char *name, const struct block *block,
+ const domain_enum domain, int search)
+{
+ struct block_symbol sym;
+
+ /* Note: We can't do a simple assert for ':' not being in NAME because
+ ':' may be in the args of a template spec. This isn't intended to be
+ a complete test, just cheap and documentary. */
+ if (strchr (name, '<') == NULL && strchr (name, '(') == NULL)
+ gdb_assert (strstr (name, "::") == NULL);
- if (sym != NULL)
+ sym = lookup_symbol_in_static_block (name, block, domain);
+ if (sym.symbol != NULL)
return sym;
- if (search)
+ /* If we didn't find a definition for a builtin type in the static block,
+ search for it now. This is actually the right thing to do and can be
+ a massive performance win. E.g., when debugging a program with lots of
+ shared libraries we could search all of them only to find out the
+ builtin type isn't defined in any of them. This is common for types
+ like "void". */
+ if (langdef != NULL && domain == VAR_DOMAIN)
{
- char *klass, *nested;
- unsigned int prefix_len;
- struct cleanup *cleanup;
- struct symbol *klass_sym;
-
- /* A simple lookup failed. Check if the symbol was defined in
- a base class. */
+ struct gdbarch *gdbarch;
- cleanup = make_cleanup (null_cleanup, NULL);
+ if (block == NULL)
+ gdbarch = target_gdbarch ();
+ else
+ gdbarch = block_gdbarch (block);
+ sym.symbol
+ = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
+ sym.block = NULL;
+ if (sym.symbol != NULL)
+ return sym;
+ }
- /* Find the name of the class and the name of the method,
- variable, etc. */
- prefix_len = cp_entire_prefix_len (name);
+ sym = lookup_global_symbol (name, block, domain);
+ if (sym.symbol != NULL)
+ return sym;
- /* If no prefix was found, search "this". */
- if (prefix_len == 0)
- {
- struct type *type;
- struct symbol *this;
+ if (search)
+ {
+ struct block_symbol lang_this;
+ struct type *type;
- this = lookup_language_this (language_def (language_cplus), block);
- if (this == NULL)
- {
- do_cleanups (cleanup);
- return NULL;
- }
+ lang_this.symbol = NULL;
- type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (this)));
- /* If TYPE_NAME is NULL, abandon trying to find this symbol.
- This can happen for lambda functions compiled with clang++,
- which outputs no name for the container class. */
- if (TYPE_NAME (type) == NULL)
- return NULL;
- klass = xstrdup (TYPE_NAME (type));
- nested = xstrdup (name);
- }
- else
- {
- /* The class name is everything up to and including PREFIX_LEN. */
- klass = savestring (name, prefix_len);
+ if (langdef != NULL)
+ lang_this = lookup_language_this (langdef, block);
- /* The rest of the name is everything else past the initial scope
- operator. */
- nested = xstrdup (name + prefix_len + 2);
- }
+ if (lang_this.symbol == NULL)
+ return {};
- /* Add cleanups to free memory for these strings. */
- make_cleanup (xfree, klass);
- make_cleanup (xfree, nested);
- /* Lookup a class named KLASS. If none is found, there is nothing
- more that can be done. */
- klass_sym = lookup_global_symbol (klass, block, domain);
- if (klass_sym == NULL)
- {
- do_cleanups (cleanup);
- return NULL;
- }
+ type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol)));
+ /* If TYPE_NAME is NULL, abandon trying to find this symbol.
+ This can happen for lambda functions compiled with clang++,
+ which outputs no name for the container class. */
+ if (TYPE_NAME (type) == NULL)
+ return {};
- /* Look for a symbol named NESTED in this class. */
- sym = cp_lookup_nested_symbol (SYMBOL_TYPE (klass_sym), nested, block);
- do_cleanups (cleanup);
+ /* Look for symbol NAME in this class. */
+ sym = cp_lookup_nested_symbol (type, name, block, domain);
}
return sym;
}
+/* Search NAME in DOMAIN in all static blocks, and then in all baseclasses.
+ BLOCK specifies the context in which to perform the search.
+ NAME is guaranteed to have scope (contain "::") and PREFIX_LEN specifies
+ the length of the entire scope of NAME (up to, but not including, the last
+ "::".
+
+ Note: At least in the case of Fortran, which also uses this code, there
+ may be no text after the last "::". */
+
+static struct block_symbol
+cp_search_static_and_baseclasses (const char *name,
+ const struct block *block,
+ const domain_enum domain,
+ unsigned int prefix_len,
+ int is_in_anonymous)
+{
+ /* Check for malformed input. */
+ if (prefix_len + 2 > strlen (name) || name[prefix_len + 1] != ':')
+ return {};
+
+ /* The class, namespace or function name is everything up to and
+ including PREFIX_LEN. */
+ std::string scope (name, prefix_len);
+
+ /* The rest of the name is everything else past the initial scope
+ operator. */
+ const char *nested = name + prefix_len + 2;
+
+ /* Lookup the scope symbol. If none is found, there is nothing more
+ that can be done. SCOPE could be a namespace, so always look in
+ VAR_DOMAIN. This works for classes too because of
+ symbol_matches_domain (which should be replaced with something
+ else, but it's what we have today). */
+ block_symbol scope_sym = lookup_symbol_in_static_block (scope.c_str (),
+ block, VAR_DOMAIN);
+ if (scope_sym.symbol == NULL)
+ scope_sym = lookup_global_symbol (scope.c_str (), block, VAR_DOMAIN);
+ if (scope_sym.symbol == NULL)
+ return {};
+
+ struct type *scope_type = SYMBOL_TYPE (scope_sym.symbol);
+
+ /* If the scope is a function/method, then look up NESTED as a local
+ static variable. E.g., "print 'function()::static_var'". */
+ if ((TYPE_CODE (scope_type) == TYPE_CODE_FUNC
+ || TYPE_CODE (scope_type) == TYPE_CODE_METHOD)
+ && domain == VAR_DOMAIN)
+ return lookup_symbol (nested, SYMBOL_BLOCK_VALUE (scope_sym.symbol),
+ VAR_DOMAIN, NULL);
+
+ /* Look for a symbol named NESTED in this class/namespace.
+ The caller is assumed to have already have done a basic lookup of NAME.
+ So we pass zero for BASIC_LOOKUP to cp_lookup_nested_symbol_1 here. */
+ return cp_lookup_nested_symbol_1 (scope_type, nested, name,
+ block, domain, 0, is_in_anonymous);
+}
+
/* Look up NAME in the C++ namespace NAMESPACE. Other arguments are
as in cp_lookup_symbol_nonlocal. If SEARCH is non-zero, search
- through base classes for a matching symbol. */
+ through base classes for a matching symbol.
-static struct symbol *
-cp_lookup_symbol_in_namespace (const char *namespace,
- const char *name,
- const struct block *block,
- const domain_enum domain, int search)
+ Note: Part of the complexity is because NAME may itself specify scope.
+ Part of the complexity is also because this handles the case where
+ there is no scoping in which case we also try looking in the class of
+ "this" if we can compute it. */
+
+static struct block_symbol
+cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name,
+ const struct block *block,
+ const domain_enum domain, int search)
{
- if (namespace[0] == '\0')
- {
- return lookup_symbol_file (name, block, domain, 0, search);
- }
- else
- {
- char *concatenated_name = alloca (strlen (namespace) + 2
- + strlen (name) + 1);
+ char *concatenated_name = NULL;
+ int is_in_anonymous;
+ unsigned int prefix_len;
+ struct block_symbol sym;
- strcpy (concatenated_name, namespace);
+ if (the_namespace[0] != '\0')
+ {
+ concatenated_name
+ = (char *) alloca (strlen (the_namespace) + 2 + strlen (name) + 1);
+ strcpy (concatenated_name, the_namespace);
strcat (concatenated_name, "::");
strcat (concatenated_name, name);
- return lookup_symbol_file (concatenated_name, block, domain,
- cp_is_in_anonymous (namespace), search);
+ name = concatenated_name;
}
-}
-/* Used for cleanups to reset the "searched" flag incase
- of an error. */
+ prefix_len = cp_entire_prefix_len (name);
+ if (prefix_len == 0)
+ return cp_lookup_bare_symbol (NULL, name, block, domain, search);
-static void
-reset_directive_searched (void *data)
-{
- struct using_direct *direct = data;
- direct->searched = 0;
+ /* This would be simpler if we just called cp_lookup_nested_symbol
+ at this point. But that would require first looking up the containing
+ class/namespace. Since we're only searching static and global blocks
+ there's often no need to first do that lookup. */
+
+ is_in_anonymous
+ = the_namespace[0] != '\0' && cp_is_in_anonymous (the_namespace);
+ sym = cp_basic_lookup_symbol (name, block, domain, is_in_anonymous);
+ if (sym.symbol != NULL)
+ return sym;
+
+ if (search)
+ sym = cp_search_static_and_baseclasses (name, block, domain, prefix_len,
+ is_in_anonymous);
+
+ return sym;
}
/* Search for NAME by applying all import statements belonging to
If SCOPE is "A::B" and SEARCH_PARENTS is true the imports of
namespaces X and Y will be considered. If SEARCH_PARENTS is false
- only the import of Y is considered. */
+ only the import of Y is considered.
-static struct symbol *
+ SEARCH_SCOPE_FIRST is an internal implementation detail: Callers must
+ pass 0 for it. Internally we pass 1 when recursing. */
+
+static struct block_symbol
cp_lookup_symbol_via_imports (const char *scope,
const char *name,
const struct block *block,
const domain_enum domain,
+ const int search_scope_first,
const int declaration_only,
const int search_parents)
{
struct using_direct *current;
- struct symbol *sym = NULL;
+ struct block_symbol sym = {};
int len;
int directive_match;
- struct cleanup *searched_cleanup;
- /* First, try to find the symbol in the given namespace. */
- if (!declaration_only)
+ /* First, try to find the symbol in the given namespace if requested. */
+ if (search_scope_first)
sym = cp_lookup_symbol_in_namespace (scope, name,
block, domain, 1);
- if (sym != NULL)
+ if (sym.symbol != NULL)
return sym;
/* Go through the using directives. If any of them add new names to
len = strlen (current->import_dest);
directive_match = (search_parents
- ? (strncmp (scope, current->import_dest,
- strlen (current->import_dest)) == 0
+ ? (startswith (scope, current->import_dest)
&& (len == 0
|| scope[len] == ':'
|| scope[len] == '\0'))
{
/* Mark this import as searched so that the recursive call
does not search it again. */
- current->searched = 1;
- searched_cleanup = make_cleanup (reset_directive_searched,
- current);
+ scoped_restore reset_directive_searched
+ = make_scoped_restore (¤t->searched, 1);
/* If there is an import of a single declaration, compare the
imported declaration (after optional renaming by its alias)
/* If this is a DECLARATION_ONLY search or a symbol was found
or this import statement was an import declaration, the
search of this import is complete. */
- if (declaration_only || sym != NULL || current->declaration)
+ if (declaration_only || sym.symbol != NULL || current->declaration)
{
- current->searched = 0;
- discard_cleanups (searched_cleanup);
-
- if (sym != NULL)
+ if (sym.symbol != NULL)
return sym;
continue;
if (strcmp (name, *excludep) == 0)
break;
if (*excludep)
- {
- discard_cleanups (searched_cleanup);
- continue;
- }
+ continue;
if (current->alias != NULL
&& strcmp (name, current->alias) == 0)
towards the imported namespace. */
sym = cp_lookup_symbol_via_imports (current->import_src,
name, block,
- domain, 0, 0);
+ domain, 1, 0, 0);
}
- current->searched = 0;
- discard_cleanups (searched_cleanup);
- if (sym != NULL)
+ if (sym.symbol != NULL)
return sym;
}
}
- return NULL;
+ return {};
}
-/* Helper function that searches an array of symbols for one named
- NAME. */
+/* Helper function that searches an array of symbols for one named NAME. */
static struct symbol *
search_symbol_list (const char *name, int num,
/* Maybe we should store a dictionary in here instead. */
for (i = 0; i < num; ++i)
{
- if (strcmp (name, SYMBOL_NATURAL_NAME (syms[i])) == 0)
+ if (strcmp (name, syms[i]->natural_name ()) == 0)
return syms[i];
}
return NULL;
searches through the template parameters of the function and the
function's type. */
-struct symbol *
+struct block_symbol
cp_lookup_symbol_imports_or_template (const char *scope,
const char *name,
const struct block *block,
const domain_enum domain)
{
struct symbol *function = BLOCK_FUNCTION (block);
- struct symbol *result;
+ struct block_symbol result;
if (symbol_lookup_debug)
{
domain_name (domain));
}
- if (function != NULL && SYMBOL_LANGUAGE (function) == language_cplus)
+ if (function != NULL && function->language () == language_cplus)
{
/* Search the function's template parameters. */
if (SYMBOL_IS_CPLUS_TEMPLATE_FUNCTION (function))
{
struct template_symbol *templ
= (struct template_symbol *) function;
+ struct symbol *sym = search_symbol_list (name,
+ templ->n_template_arguments,
+ templ->template_arguments);
- result = search_symbol_list (name,
- templ->n_template_arguments,
- templ->template_arguments);
- if (result != NULL)
+ if (sym != NULL)
{
if (symbol_lookup_debug)
{
fprintf_unfiltered (gdb_stdlog,
"cp_lookup_symbol_imports_or_template"
" (...) = %s\n",
- host_address_to_string (result));
+ host_address_to_string (sym));
}
- return result;
+ return (struct block_symbol) {sym, block};
}
}
/* Search the template parameters of the function's defining
context. */
- if (SYMBOL_NATURAL_NAME (function))
+ if (function->natural_name ())
{
struct type *context;
- char *name_copy = xstrdup (SYMBOL_NATURAL_NAME (function));
- struct cleanup *cleanups = make_cleanup (xfree, name_copy);
+ std::string name_copy (function->natural_name ());
const struct language_defn *lang = language_def (language_cplus);
- struct gdbarch *arch
- = get_objfile_arch (SYMBOL_OBJFILE (function));
const struct block *parent = BLOCK_SUPERBLOCK (block);
+ struct symbol *sym;
while (1)
{
- unsigned int prefix_len = cp_entire_prefix_len (name_copy);
+ unsigned int prefix_len
+ = cp_entire_prefix_len (name_copy.c_str ());
if (prefix_len == 0)
context = NULL;
else
{
- name_copy[prefix_len] = '\0';
- context = lookup_typename (lang, arch,
- name_copy,
+ name_copy.erase (prefix_len);
+ context = lookup_typename (lang,
+ name_copy.c_str (),
parent, 1);
}
if (context == NULL)
break;
- result
+ sym
= search_symbol_list (name,
TYPE_N_TEMPLATE_ARGUMENTS (context),
TYPE_TEMPLATE_ARGUMENTS (context));
- if (result != NULL)
+ if (sym != NULL)
{
- do_cleanups (cleanups);
if (symbol_lookup_debug)
{
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_symbol_imports_or_template"
- " (...) = %s\n",
- host_address_to_string (result));
+ fprintf_unfiltered
+ (gdb_stdlog,
+ "cp_lookup_symbol_imports_or_template (...) = %s\n",
+ host_address_to_string (sym));
}
- return result;
+ return (struct block_symbol) {sym, parent};
}
}
-
- do_cleanups (cleanups);
}
}
- result = cp_lookup_symbol_via_imports (scope, name, block, domain, 1, 1);
+ result = cp_lookup_symbol_via_imports (scope, name, block, domain, 0, 1, 1);
if (symbol_lookup_debug)
{
fprintf_unfiltered (gdb_stdlog,
"cp_lookup_symbol_imports_or_template (...) = %s\n",
- result != NULL
- ? host_address_to_string (result) : "NULL");
+ result.symbol != NULL
+ ? host_address_to_string (result.symbol) : "NULL");
}
return result;
}
+/* Search for NAME by applying relevant import statements belonging to BLOCK
+ and its parents. SCOPE is the namespace scope of the context in which the
+ search is being evaluated. */
+
+static struct block_symbol
+cp_lookup_symbol_via_all_imports (const char *scope, const char *name,
+ const struct block *block,
+ const domain_enum domain)
+{
+ struct block_symbol sym;
+
+ while (block != NULL)
+ {
+ sym = cp_lookup_symbol_via_imports (scope, name, block, domain, 0, 0, 1);
+ if (sym.symbol)
+ return sym;
+
+ block = BLOCK_SUPERBLOCK (block);
+ }
+
+ return {};
+}
+
/* Searches for NAME in the current namespace, and by applying
relevant import statements belonging to BLOCK and its parents.
SCOPE is the namespace scope of the context in which the search is
being evaluated. */
-struct symbol*
+struct block_symbol
cp_lookup_symbol_namespace (const char *scope,
const char *name,
const struct block *block,
const domain_enum domain)
{
- struct symbol *sym;
+ struct block_symbol sym;
if (symbol_lookup_debug)
{
}
/* First, try to find the symbol in the given namespace. */
- sym = cp_lookup_symbol_in_namespace (scope, name,
- block, domain, 1);
- if (sym != NULL)
- {
- if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_symbol_namespace (...) = %s\n",
- host_address_to_string (sym));
- }
- return sym;
- }
+ sym = cp_lookup_symbol_in_namespace (scope, name, block, domain, 1);
- /* Search for name in namespaces imported to this and parent
- blocks. */
- while (block != NULL)
- {
- sym = cp_lookup_symbol_via_imports (scope, name, block,
- domain, 0, 1);
-
- if (sym)
- {
- if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_symbol_namespace (...) = %s\n",
- host_address_to_string (sym));
- }
- return sym;
- }
-
- block = BLOCK_SUPERBLOCK (block);
- }
+ /* Search for name in namespaces imported to this and parent blocks. */
+ if (sym.symbol == NULL)
+ sym = cp_lookup_symbol_via_all_imports (scope, name, block, domain);
if (symbol_lookup_debug)
{
fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_symbol_namespace (...) = NULL\n");
+ "cp_lookup_symbol_namespace (...) = %s\n",
+ sym.symbol != NULL
+ ? host_address_to_string (sym.symbol) : "NULL");
}
- return NULL;
+ return sym;
}
/* Lookup NAME at namespace scope (or, in C terms, in static and
"A::x", and if that call fails, then the first call looks for
"x". */
-static struct symbol *
-lookup_namespace_scope (const char *name,
+static struct block_symbol
+lookup_namespace_scope (const struct language_defn *langdef,
+ const char *name,
const struct block *block,
const domain_enum domain,
const char *scope,
int scope_len)
{
- char *namespace;
+ char *the_namespace;
if (scope[scope_len] != '\0')
{
/* Recursively search for names in child namespaces first. */
- struct symbol *sym;
+ struct block_symbol sym;
int new_scope_len = scope_len;
/* If the current scope is followed by "::", skip past that. */
new_scope_len += 2;
}
new_scope_len += cp_find_first_component (scope + new_scope_len);
- sym = lookup_namespace_scope (name, block, domain,
+ sym = lookup_namespace_scope (langdef, name, block, domain,
scope, new_scope_len);
- if (sym != NULL)
+ if (sym.symbol != NULL)
return sym;
}
/* Okay, we didn't find a match in our children, so look for the
- name in the current namespace. */
-
- namespace = alloca (scope_len + 1);
- strncpy (namespace, scope, scope_len);
- namespace[scope_len] = '\0';
- return cp_lookup_symbol_in_namespace (namespace, name,
+ name in the current namespace.
+
+ If we there is no scope and we know we have a bare symbol, then short
+ circuit everything and call cp_lookup_bare_symbol directly.
+ This isn't an optimization, rather it allows us to pass LANGDEF which
+ is needed for primitive type lookup. The test doesn't have to be
+ perfect: if NAME is a bare symbol that our test doesn't catch (e.g., a
+ template symbol with "::" in the argument list) then
+ cp_lookup_symbol_in_namespace will catch it. */
+
+ if (scope_len == 0 && strchr (name, ':') == NULL)
+ return cp_lookup_bare_symbol (langdef, name, block, domain, 1);
+
+ the_namespace = (char *) alloca (scope_len + 1);
+ strncpy (the_namespace, scope, scope_len);
+ the_namespace[scope_len] = '\0';
+ return cp_lookup_symbol_in_namespace (the_namespace, name,
block, domain, 1);
}
we're looking for, BLOCK is the block that we're searching within,
DOMAIN says what kind of symbols we're looking for. */
-struct symbol *
-cp_lookup_symbol_nonlocal (const char *name,
+struct block_symbol
+cp_lookup_symbol_nonlocal (const struct language_defn *langdef,
+ const char *name,
const struct block *block,
const domain_enum domain)
{
- struct symbol *sym;
+ struct block_symbol sym;
const char *scope = block_scope (block);
if (symbol_lookup_debug)
domain_name (domain));
}
- sym = lookup_namespace_scope (name, block, domain, scope, 0);
- if (sym != NULL)
- {
- if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_symbol_nonlocal (...) = %s\n",
- host_address_to_string (sym));
- }
- return sym;
- }
+ /* First, try to find the symbol in the given namespace, and all
+ containing namespaces. */
+ sym = lookup_namespace_scope (langdef, name, block, domain, scope, 0);
+
+ /* Search for name in namespaces imported to this and parent blocks. */
+ if (sym.symbol == NULL)
+ sym = cp_lookup_symbol_via_all_imports (scope, name, block, domain);
- sym = cp_lookup_symbol_namespace (scope, name, block, domain);
if (symbol_lookup_debug)
{
fprintf_unfiltered (gdb_stdlog,
"cp_lookup_symbol_nonlocal (...) = %s\n",
- sym != NULL ? host_address_to_string (sym) : "NULL");
+ (sym.symbol != NULL
+ ? host_address_to_string (sym.symbol)
+ : "NULL"));
}
return sym;
}
{
int i;
- CHECK_TYPEDEF (parent_type);
+ parent_type = check_typedef (parent_type);
for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i)
{
struct type *type = check_typedef (TYPE_BASECLASS (parent_type, i));
/* Search through the base classes of PARENT_TYPE for a symbol named
NAME in block BLOCK. */
-static struct symbol *
+static struct block_symbol
find_symbol_in_baseclass (struct type *parent_type, const char *name,
- const struct block *block)
+ const struct block *block, const domain_enum domain,
+ int is_in_anonymous)
{
int i;
- struct symbol *sym;
- struct cleanup *cleanup;
- char *concatenated_name;
-
- sym = NULL;
- concatenated_name = NULL;
- cleanup = make_cleanup (free_current_contents, &concatenated_name);
+ struct block_symbol sym = {};
for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i)
{
- size_t len;
struct type *base_type = TYPE_BASECLASS (parent_type, i);
const char *base_name = TYPE_BASECLASS_NAME (parent_type, i);
if (base_name == NULL)
continue;
- /* Search this particular base class. */
- sym = cp_lookup_symbol_in_namespace (base_name, name, block,
- VAR_DOMAIN, 0);
- if (sym != NULL)
- break;
+ std::string concatenated_name = std::string (base_name) + "::" + name;
- /* Now search all static file-level symbols. We have to do this for
- things like typedefs in the class. First search in this symtab,
- what we want is possibly there. */
- len = strlen (base_name) + 2 + strlen (name) + 1;
- concatenated_name = xrealloc (concatenated_name, len);
- xsnprintf (concatenated_name, len, "%s::%s", base_name, name);
- sym = lookup_symbol_in_static_block (concatenated_name, block,
- VAR_DOMAIN);
- if (sym != NULL)
+ sym = cp_lookup_nested_symbol_1 (base_type, name,
+ concatenated_name.c_str (),
+ block, domain, 1, is_in_anonymous);
+ if (sym.symbol != NULL)
break;
+ }
- /* Nope. We now have to search all static blocks in all objfiles,
- even if block != NULL, because there's no guarantees as to which
- symtab the symbol we want is in. */
- sym = lookup_static_symbol (concatenated_name, VAR_DOMAIN);
- if (sym != NULL)
- break;
+ return sym;
+}
- /* If this class has base classes, search them next. */
- CHECK_TYPEDEF (base_type);
- if (TYPE_N_BASECLASSES (base_type) > 0)
- {
- sym = find_symbol_in_baseclass (base_type, name, block);
- if (sym != NULL)
- break;
- }
+/* Helper function to look up NESTED_NAME in CONTAINER_TYPE and in DOMAIN
+ and within the context of BLOCK.
+ NESTED_NAME may have scope ("::").
+ CONTAINER_TYPE needn't have been "check_typedef'd" yet.
+ CONCATENATED_NAME is the fully scoped spelling of NESTED_NAME, it is
+ passed as an argument so that callers can control how space for it is
+ allocated.
+ If BASIC_LOOKUP is non-zero then perform a basic lookup of
+ CONCATENATED_NAME. See cp_basic_lookup_symbol for details.
+ If IS_IN_ANONYMOUS is non-zero then CONCATENATED_NAME is in an anonymous
+ namespace. */
+
+static struct block_symbol
+cp_lookup_nested_symbol_1 (struct type *container_type,
+ const char *nested_name,
+ const char *concatenated_name,
+ const struct block *block,
+ const domain_enum domain,
+ int basic_lookup, int is_in_anonymous)
+{
+ struct block_symbol sym;
+
+ /* NOTE: carlton/2003-11-10: We don't treat C++ class members
+ of classes like, say, data or function members. Instead,
+ they're just represented by symbols whose names are
+ qualified by the name of the surrounding class. This is
+ just like members of namespaces; in particular,
+ cp_basic_lookup_symbol works when looking them up. */
+
+ if (basic_lookup)
+ {
+ sym = cp_basic_lookup_symbol (concatenated_name, block, domain,
+ is_in_anonymous);
+ if (sym.symbol != NULL)
+ return sym;
}
- do_cleanups (cleanup);
- return sym;
+ /* Now search all static file-level symbols. We have to do this for things
+ like typedefs in the class. We do not try to guess any imported
+ namespace as even the fully specified namespace search is already not
+ C++ compliant and more assumptions could make it too magic. */
+
+ /* First search in this symtab, what we want is possibly there. */
+ sym = lookup_symbol_in_static_block (concatenated_name, block, domain);
+ if (sym.symbol != NULL)
+ return sym;
+
+ /* Nope. We now have to search all static blocks in all objfiles,
+ even if block != NULL, because there's no guarantees as to which
+ symtab the symbol we want is in. Except for symbols defined in
+ anonymous namespaces should be treated as local to a single file,
+ which we just searched. */
+ if (!is_in_anonymous)
+ {
+ sym = lookup_static_symbol (concatenated_name, domain);
+ if (sym.symbol != NULL)
+ return sym;
+ }
+
+ /* If this is a class with baseclasses, search them next. */
+ container_type = check_typedef (container_type);
+ if (TYPE_N_BASECLASSES (container_type) > 0)
+ {
+ sym = find_symbol_in_baseclass (container_type, nested_name, block,
+ domain, is_in_anonymous);
+ if (sym.symbol != NULL)
+ return sym;
+ }
+
+ return {};
}
/* Look up a symbol named NESTED_NAME that is nested inside the C++
class or namespace given by PARENT_TYPE, from within the context
- given by BLOCK. Return NULL if there is no such nested symbol. */
+ given by BLOCK, and in DOMAIN.
+ Return NULL if there is no such nested symbol. */
-struct symbol *
+struct block_symbol
cp_lookup_nested_symbol (struct type *parent_type,
const char *nested_name,
- const struct block *block)
+ const struct block *block,
+ const domain_enum domain)
{
- /* type_name_no_tag_or_error provides better error reporting using the
+ /* type_name_or_error provides better error reporting using the
original type. */
struct type *saved_parent_type = parent_type;
- CHECK_TYPEDEF (parent_type);
+ parent_type = check_typedef (parent_type);
if (symbol_lookup_debug)
{
- const char *type_name = type_name_no_tag (saved_parent_type);
+ const char *type_name = TYPE_NAME (saved_parent_type);
fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_nested_symbol (%s, %s, %s)\n",
+ "cp_lookup_nested_symbol (%s, %s, %s, %s)\n",
type_name != NULL ? type_name : "unnamed",
- nested_name, host_address_to_string (block));
+ nested_name, host_address_to_string (block),
+ domain_name (domain));
}
switch (TYPE_CODE (parent_type))
function pointer la_lookup_symbol_nonlocal, which ends up here. */
case TYPE_CODE_MODULE:
{
- /* NOTE: carlton/2003-11-10: We don't treat C++ class members
- of classes like, say, data or function members. Instead,
- they're just represented by symbols whose names are
- qualified by the name of the surrounding class. This is
- just like members of namespaces; in particular,
- lookup_symbol_namespace works when looking them up. */
-
int size;
- const char *parent_name = type_name_no_tag_or_error (saved_parent_type);
- struct symbol *sym
- = cp_lookup_symbol_in_namespace (parent_name, nested_name,
- block, VAR_DOMAIN, 0);
+ const char *parent_name = type_name_or_error (saved_parent_type);
+ struct block_symbol sym;
char *concatenated_name;
-
- if (sym != NULL)
- {
- if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_nested_symbol (...) = %s\n",
- host_address_to_string (sym));
- }
- return sym;
- }
-
- /* Now search all static file-level symbols. We have to do this
- for things like typedefs in the class. We do not try to
- guess any imported namespace as even the fully specified
- namespace search is already not C++ compliant and more
- assumptions could make it too magic. */
+ int is_in_anonymous;
size = strlen (parent_name) + 2 + strlen (nested_name) + 1;
- concatenated_name = alloca (size);
+ concatenated_name = (char *) alloca (size);
xsnprintf (concatenated_name, size, "%s::%s",
- parent_name, nested_name);
- sym = lookup_static_symbol (concatenated_name, VAR_DOMAIN);
- if (sym != NULL)
- {
- if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "cp_lookup_nested_symbol (...) = %s\n",
- host_address_to_string (sym));
- }
- return sym;
- }
+ parent_name, nested_name);
+ is_in_anonymous = cp_is_in_anonymous (concatenated_name);
+
+ sym = cp_lookup_nested_symbol_1 (parent_type, nested_name,
+ concatenated_name, block, domain,
+ 1, is_in_anonymous);
- /* If no matching symbols were found, try searching any
- base classes. */
- sym = find_symbol_in_baseclass (parent_type, nested_name, block);
if (symbol_lookup_debug)
{
fprintf_unfiltered (gdb_stdlog,
"cp_lookup_nested_symbol (...) = %s\n",
- sym != NULL
- ? host_address_to_string (sym) : "NULL");
+ (sym.symbol != NULL
+ ? host_address_to_string (sym.symbol)
+ : "NULL"));
}
return sym;
}
"cp_lookup_nested_symbol (...) = NULL"
" (func/method)\n");
}
- return NULL;
+ return {};
default:
internal_error (__FILE__, __LINE__,
return retval;
}
- full_name = alloca (scope_length + 2 + strlen (name) + 1);
+ full_name = (char *) alloca (scope_length + 2 + strlen (name) + 1);
strncpy (full_name, scope, scope_length);
- strncpy (full_name + scope_length, "::", 2);
+ memcpy (full_name + scope_length, "::", 2);
strcpy (full_name + scope_length + 2, name);
return basic_lookup_transparent_type (full_name);
obsolete. */
static void
-maintenance_cplus_namespace (char *args, int from_tty)
+maintenance_cplus_namespace (const char *args, int from_tty)
{
printf_unfiltered (_("The `maint namespace' command was removed.\n"));
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_cp_namespace;
-
void
_initialize_cp_namespace (void)
{
projects / deliverable / binutils-gdb.git / blobdiff