X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fcp-namespace.c;h=b8b19ed7af6fa59b08e0f7d748dca0a28aa8dba7;hb=22cee43f9af76fc4c10c3d4018a9ada6d7c5c1a5;hp=2cc2ea94c2553df5e102b3f5db700af4c637a58d;hpb=d5ff04826ed6ffd265d47690e0e636e2dff5e6ae;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 2cc2ea94c2..b8b19ed7af 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -31,13 +31,15 @@ #include "frame.h" #include "buildsym.h" #include "language.h" +#include "namespace.h" -static struct symbol * +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, - int basic_lookup); + 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, @@ -90,8 +92,9 @@ cp_scan_for_anonymous_namespaces (const struct symbol *const symbol, 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); + add_using_directive (&local_using_directives, + dest, src, NULL, NULL, NULL, 1, + &objfile->objfile_obstack); } /* The "+ 2" is for the "::". */ previous_component = next_component + 2; @@ -102,102 +105,6 @@ cp_scan_for_anonymous_namespaces (const struct symbol *const symbol, } } -/* 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. */ @@ -212,14 +119,14 @@ cp_is_in_anonymous (const char *symbol_name) If IS_IN_ANONYMOUS is nonzero, the symbol in question is located within an anonymous namespace. */ -static struct symbol * +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; + struct block_symbol sym; sym = lookup_symbol_in_static_block (name, block, domain); - if (sym != NULL) + if (sym.symbol != NULL) return sym; if (is_in_anonymous) @@ -231,12 +138,13 @@ cp_basic_lookup_symbol (const char *name, const struct block *block, 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, global_block, domain); + sym.block = global_block; + } } else - { - sym = lookup_global_symbol (name, block, domain); - } + sym = lookup_global_symbol (name, block, domain); return sym; } @@ -251,12 +159,12 @@ cp_basic_lookup_symbol (const char *name, const struct block *block, 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 symbol * +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 symbol *sym; + 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 @@ -265,7 +173,7 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, gdb_assert (strchr (name, ':') == NULL); sym = lookup_symbol_in_static_block (name, block, domain); - if (sym != NULL) + if (sym.symbol != NULL) return sym; /* If we didn't find a definition for a builtin type in the static block, @@ -282,33 +190,35 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, gdbarch = target_gdbarch (); else gdbarch = block_gdbarch (block); - sym = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name); - if (sym != NULL) + sym.symbol + = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name); + sym.block = NULL; + if (sym.symbol != NULL) return sym; } sym = lookup_global_symbol (name, block, domain); - if (sym != NULL) + if (sym.symbol != NULL) return sym; if (search) { - struct symbol *this; + struct block_symbol lang_this; struct type *type; - this = lookup_language_this (language_def (language_cplus), block); - if (this == NULL) - return NULL; + lang_this = lookup_language_this (language_def (language_cplus), block); + if (lang_this.symbol == NULL) + return (struct block_symbol) {NULL, NULL}; - type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (this))); + 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 NULL; + return (struct block_symbol) {NULL, NULL}; /* Look for symbol NAME in this class. */ - sym = cp_lookup_nested_symbol (type, name, block); + sym = cp_lookup_nested_symbol (type, name, block, domain); } return sym; @@ -323,16 +233,17 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, Note: At least in the case of Fortran, which also uses this code, there may be no text after the last "::". */ -static struct symbol * +static struct block_symbol cp_search_static_and_baseclasses (const char *name, const struct block *block, const domain_enum domain, - unsigned int prefix_len) + unsigned int prefix_len, + int is_in_anonymous) { - struct symbol *sym; + struct block_symbol sym; char *klass, *nested; struct cleanup *cleanup; - struct symbol *klass_sym; + struct block_symbol klass_sym; struct type *klass_type; /* The test here uses <= instead of < because Fortran also uses this, @@ -354,19 +265,23 @@ cp_search_static_and_baseclasses (const char *name, 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) + more that can be done. KLASS 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). */ + klass_sym = lookup_global_symbol (klass, block, VAR_DOMAIN); + if (klass_sym.symbol == NULL) { do_cleanups (cleanup); - return NULL; + return (struct block_symbol) {NULL, NULL}; } - klass_type = SYMBOL_TYPE (klass_sym); + klass_type = SYMBOL_TYPE (klass_sym.symbol); /* Look for a symbol named NESTED in this class. 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. */ - sym = cp_lookup_nested_symbol_1 (klass_type, nested, name, block, 0); + sym = cp_lookup_nested_symbol_1 (klass_type, nested, name, block, domain, + 0, is_in_anonymous); do_cleanups (cleanup); return sym; @@ -381,21 +296,21 @@ cp_search_static_and_baseclasses (const char *name, there is no scoping in which case we also try looking in the class of "this" if we can compute it. */ -static struct symbol * -cp_lookup_symbol_in_namespace (const char *namespace, const char *name, +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) { char *concatenated_name = NULL; int is_in_anonymous; unsigned int prefix_len; - struct symbol *sym; + struct block_symbol sym; - if (namespace[0] != '\0') + if (the_namespace[0] != '\0') { - concatenated_name = alloca (strlen (namespace) + 2 + concatenated_name = alloca (strlen (the_namespace) + 2 + strlen (name) + 1); - strcpy (concatenated_name, namespace); + strcpy (concatenated_name, the_namespace); strcat (concatenated_name, "::"); strcat (concatenated_name, name); name = concatenated_name; @@ -410,13 +325,15 @@ cp_lookup_symbol_in_namespace (const char *namespace, const char *name, class/namespace. Since we're only searching static and global blocks there's often no need to first do that lookup. */ - is_in_anonymous = namespace[0] != '\0' && cp_is_in_anonymous (namespace); + 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 != NULL) + if (sym.symbol != NULL) return sym; if (search) - sym = cp_search_static_and_baseclasses (name, block, domain, prefix_len); + sym = cp_search_static_and_baseclasses (name, block, domain, prefix_len, + is_in_anonymous); return sym; } @@ -458,7 +375,7 @@ reset_directive_searched (void *data) SEARCH_SCOPE_FIRST is an internal implementation detail: Callers must pass 0 for it. Internally we pass 1 when recursing. */ -static struct symbol * +static struct block_symbol cp_lookup_symbol_via_imports (const char *scope, const char *name, const struct block *block, @@ -468,17 +385,20 @@ cp_lookup_symbol_via_imports (const char *scope, 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; + sym.symbol = NULL; + sym.block = NULL; + /* 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 @@ -493,8 +413,7 @@ cp_lookup_symbol_via_imports (const char *scope, 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')) @@ -525,12 +444,12 @@ cp_lookup_symbol_via_imports (const char *scope, /* 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; @@ -568,12 +487,12 @@ cp_lookup_symbol_via_imports (const char *scope, current->searched = 0; discard_cleanups (searched_cleanup); - if (sym != NULL) + if (sym.symbol != NULL) return sym; } } - return NULL; + return (struct block_symbol) {NULL, NULL}; } /* Helper function that searches an array of symbols for one named NAME. */ @@ -597,14 +516,14 @@ search_symbol_list (const char *name, int num, 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) { @@ -622,20 +541,20 @@ cp_lookup_symbol_imports_or_template (const char *scope, { 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}; } } @@ -649,6 +568,7 @@ cp_lookup_symbol_imports_or_template (const char *scope, const struct language_defn *lang = language_def (language_cplus); struct gdbarch *arch = symbol_arch (function); const struct block *parent = BLOCK_SUPERBLOCK (block); + struct symbol *sym; while (1) { @@ -667,21 +587,21 @@ cp_lookup_symbol_imports_or_template (const char *scope, 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}; } } @@ -694,8 +614,8 @@ cp_lookup_symbol_imports_or_template (const char *scope, { 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; } @@ -704,23 +624,23 @@ cp_lookup_symbol_imports_or_template (const char *scope, and its parents. SCOPE is the namespace scope of the context in which the search is being evaluated. */ -static struct symbol * +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 symbol *sym; + struct block_symbol sym; while (block != NULL) { sym = cp_lookup_symbol_via_imports (scope, name, block, domain, 0, 0, 1); - if (sym) + if (sym.symbol) return sym; block = BLOCK_SUPERBLOCK (block); } - return NULL; + return (struct block_symbol) {NULL, NULL}; } /* Searches for NAME in the current namespace, and by applying @@ -728,13 +648,13 @@ cp_lookup_symbol_via_all_imports (const char *scope, const char *name, 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) { @@ -748,14 +668,15 @@ cp_lookup_symbol_namespace (const char *scope, sym = cp_lookup_symbol_in_namespace (scope, name, block, domain, 1); /* Search for name in namespaces imported to this and parent blocks. */ - if (sym == NULL) + 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 (...) = %s\n", - sym != NULL ? host_address_to_string (sym) : "NULL"); + sym.symbol != NULL + ? host_address_to_string (sym.symbol) : "NULL"); } return sym; } @@ -775,7 +696,7 @@ cp_lookup_symbol_namespace (const char *scope, "A::x", and if that call fails, then the first call looks for "x". */ -static struct symbol * +static struct block_symbol lookup_namespace_scope (const struct language_defn *langdef, const char *name, const struct block *block, @@ -783,13 +704,13 @@ lookup_namespace_scope (const struct language_defn *langdef, 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. */ @@ -801,7 +722,7 @@ lookup_namespace_scope (const struct language_defn *langdef, new_scope_len += cp_find_first_component (scope + new_scope_len); sym = lookup_namespace_scope (langdef, name, block, domain, scope, new_scope_len); - if (sym != NULL) + if (sym.symbol != NULL) return sym; } @@ -819,10 +740,10 @@ lookup_namespace_scope (const struct language_defn *langdef, if (scope_len == 0 && strchr (name, ':') == NULL) return cp_lookup_bare_symbol (langdef, name, block, domain, 1); - namespace = alloca (scope_len + 1); - strncpy (namespace, scope, scope_len); - namespace[scope_len] = '\0'; - return cp_lookup_symbol_in_namespace (namespace, name, + the_namespace = 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); } @@ -832,13 +753,13 @@ lookup_namespace_scope (const struct language_defn *langdef, 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 * +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) @@ -855,14 +776,16 @@ cp_lookup_symbol_nonlocal (const struct language_defn *langdef, sym = lookup_namespace_scope (langdef, name, block, domain, scope, 0); /* Search for name in namespaces imported to this and parent blocks. */ - if (sym == NULL) + 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_nonlocal (...) = %s\n", - sym != NULL ? host_address_to_string (sym) : "NULL"); + (sym.symbol != NULL + ? host_address_to_string (sym.symbol) + : "NULL")); } return sym; } @@ -875,7 +798,7 @@ cp_find_type_baseclass_by_name (struct type *parent_type, const char *name) { 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)); @@ -898,16 +821,18 @@ cp_find_type_baseclass_by_name (struct type *parent_type, const char *name) /* 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 block_symbol sym; struct cleanup *cleanup; char *concatenated_name; - sym = NULL; + sym.symbol = NULL; + sym.block = NULL; concatenated_name = NULL; cleanup = make_cleanup (free_current_contents, &concatenated_name); @@ -925,8 +850,8 @@ find_symbol_in_baseclass (struct type *parent_type, const char *name, xsnprintf (concatenated_name, len, "%s::%s", base_name, name); sym = cp_lookup_nested_symbol_1 (base_type, name, concatenated_name, - block, 1); - if (sym != NULL) + block, domain, 1, is_in_anonymous); + if (sym.symbol != NULL) break; } @@ -934,25 +859,27 @@ find_symbol_in_baseclass (struct type *parent_type, const char *name, return sym; } -/* Helper function to look up NESTED_NAME in CONTAINER_TYPE within the - context of BLOCK. +/* 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. */ + 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 symbol * +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, - int basic_lookup) + const domain_enum domain, + int basic_lookup, int is_in_anonymous) { - int is_in_anonymous = cp_is_in_anonymous (concatenated_name); - struct symbol *sym; + 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, @@ -963,9 +890,9 @@ cp_lookup_nested_symbol_1 (struct type *container_type, if (basic_lookup) { - sym = cp_basic_lookup_symbol (concatenated_name, block, VAR_DOMAIN, + sym = cp_basic_lookup_symbol (concatenated_name, block, domain, is_in_anonymous); - if (sym != NULL) + if (sym.symbol != NULL) return sym; } @@ -975,52 +902,61 @@ cp_lookup_nested_symbol_1 (struct type *container_type, 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, VAR_DOMAIN); - if (sym != NULL) + 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. */ - sym = lookup_static_symbol (concatenated_name, VAR_DOMAIN); - if (sym != NULL) - return sym; + 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. */ - CHECK_TYPEDEF (container_type); + container_type = check_typedef (container_type); if (TYPE_N_BASECLASSES (container_type) > 0) { - sym = find_symbol_in_baseclass (container_type, nested_name, block); - if (sym != NULL) + sym = find_symbol_in_baseclass (container_type, nested_name, block, + domain, is_in_anonymous); + if (sym.symbol != NULL) return sym; } - return NULL; + return (struct block_symbol) {NULL, NULL}; } /* 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 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); 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)) @@ -1036,23 +972,27 @@ cp_lookup_nested_symbol (struct type *parent_type, { int size; const char *parent_name = type_name_no_tag_or_error (saved_parent_type); - struct symbol *sym; + struct block_symbol sym; char *concatenated_name; + int is_in_anonymous; size = strlen (parent_name) + 2 + strlen (nested_name) + 1; concatenated_name = alloca (size); xsnprintf (concatenated_name, size, "%s::%s", 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, 1); + concatenated_name, block, domain, + 1, is_in_anonymous); 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; } @@ -1065,7 +1005,7 @@ cp_lookup_nested_symbol (struct type *parent_type, "cp_lookup_nested_symbol (...) = NULL" " (func/method)\n"); } - return NULL; + return (struct block_symbol) {NULL, NULL}; default: internal_error (__FILE__, __LINE__,