X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-namespace.c;h=185607e4eb84f901dc974dbd26b3ed0bd5815bff;hb=10b2ded43caa3298cded1df8b620caaaee3f9209;hp=f5f4bad878de10f3ea43ccbdacb719255c3ebce4;hpb=1da03605ced73fc20f40ad649f3038e654d36dee;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index f5f4bad878..185607e4eb 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -1,5 +1,5 @@ /* Helper routines for C++ support in GDB. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2018 Free Software Foundation, Inc. Contributed by David Carlton and by Kealia, Inc. @@ -31,6 +31,8 @@ #include "frame.h" #include "buildsym.h" #include "language.h" +#include "namespace.h" +#include static struct block_symbol cp_lookup_nested_symbol_1 (struct type *container_type, @@ -78,8 +80,8 @@ cp_scan_for_anonymous_namespaces (const struct symbol *const symbol, ? 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); @@ -91,8 +93,10 @@ 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); + std::vector excludes; + add_using_directive (&local_using_directives, + dest, src, NULL, NULL, excludes, 1, + &objfile->objfile_obstack); } /* The "+ 2" is for the "::". */ previous_component = next_component + 2; @@ -103,102 +107,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 *newobj; - - /* 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; - } - - newobj = obstack_alloc (obstack, (sizeof (*newobj) - + (VEC_length (const_char_ptr, excludes) - * sizeof (*newobj->excludes)))); - memset (newobj, 0, sizeof (*newobj)); - - if (copy_names) - { - newobj->import_src = obstack_copy0 (obstack, src, strlen (src)); - newobj->import_dest = obstack_copy0 (obstack, dest, strlen (dest)); - } - else - { - newobj->import_src = src; - newobj->import_dest = dest; - } - - if (alias != NULL && copy_names) - newobj->alias = obstack_copy0 (obstack, alias, strlen (alias)); - else - newobj->alias = alias; - - if (declaration != NULL && copy_names) - newobj->declaration = obstack_copy0 (obstack, - declaration, strlen (declaration)); - else - newobj->declaration = declaration; - - memcpy (newobj->excludes, VEC_address (const_char_ptr, excludes), - VEC_length (const_char_ptr, excludes) * sizeof (*newobj->excludes)); - newobj->excludes[VEC_length (const_char_ptr, excludes)] = NULL; - - newobj->next = using_directives; - using_directives = newobj; -} - /* Test whether or not NAMESPACE looks like it mentions an anonymous namespace; return nonzero if so. */ @@ -233,7 +141,9 @@ cp_basic_lookup_symbol (const char *name, const struct block *block, if (global_block != NULL) { - sym.symbol = 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; } } @@ -264,7 +174,7 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, ':' 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 (strchr (name, ':') == NULL); + gdb_assert (strstr (name, "::") == NULL); sym = lookup_symbol_in_static_block (name, block, domain); if (sym.symbol != NULL) @@ -300,16 +210,21 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, struct block_symbol lang_this; struct type *type; - lang_this = lookup_language_this (language_def (language_cplus), block); + lang_this.symbol = NULL; + + if (langdef != NULL) + lang_this = lookup_language_this (langdef, block); + if (lang_this.symbol == NULL) - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; + 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 (struct block_symbol) {NULL, NULL}; + return null_block_symbol; /* Look for symbol NAME in this class. */ sym = cp_lookup_nested_symbol (type, name, block, domain); @@ -334,51 +249,44 @@ cp_search_static_and_baseclasses (const char *name, unsigned int prefix_len, int is_in_anonymous) { - struct block_symbol sym; - char *klass, *nested; - struct cleanup *cleanup; - struct block_symbol klass_sym; - struct type *klass_type; - - /* The test here uses <= instead of < because Fortran also uses this, - and the module.exp testcase will pass "modmany::" for NAME here. */ - gdb_assert (prefix_len + 2 <= strlen (name)); - gdb_assert (name[prefix_len + 1] == ':'); - - /* Find the name of the class and the name of the method, variable, etc. */ + /* Check for malformed input. */ + if (prefix_len + 2 > strlen (name) || name[prefix_len + 1] != ':') + return null_block_symbol; - /* The class name is everything up to and including PREFIX_LEN. */ - klass = savestring (name, prefix_len); + /* 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. */ - nested = xstrdup (name + prefix_len + 2); - - /* Add cleanups to free memory for these strings. */ - cleanup = 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 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 (struct block_symbol) {NULL, NULL}; - } - klass_type = SYMBOL_TYPE (klass_sym.symbol); - - /* Look for a symbol named NESTED in this class. + 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 null_block_symbol; + + 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) + 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. */ - sym = cp_lookup_nested_symbol_1 (klass_type, nested, name, block, domain, - 0, is_in_anonymous); - - do_cleanups (cleanup); - return sym; + 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 @@ -402,8 +310,8 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, if (the_namespace[0] != '\0') { - concatenated_name = alloca (strlen (the_namespace) + 2 - + strlen (name) + 1); + concatenated_name + = (char *) alloca (strlen (the_namespace) + 2 + strlen (name) + 1); strcpy (concatenated_name, the_namespace); strcat (concatenated_name, "::"); strcat (concatenated_name, name); @@ -432,15 +340,6 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, return sym; } -/* Used for cleanups to reset the "searched" flag in case of an error. */ - -static void -reset_directive_searched (void *data) -{ - struct using_direct *direct = data; - direct->searched = 0; -} - /* Search for NAME by applying all import statements belonging to BLOCK which are applicable in SCOPE. If DECLARATION_ONLY the search is restricted to using declarations. @@ -482,7 +381,6 @@ cp_lookup_symbol_via_imports (const char *scope, struct block_symbol sym; int len; int directive_match; - struct cleanup *searched_cleanup; sym.symbol = NULL; sym.block = NULL; @@ -519,9 +417,8 @@ cp_lookup_symbol_via_imports (const char *scope, { /* 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) @@ -540,9 +437,6 @@ cp_lookup_symbol_via_imports (const char *scope, search of this import is complete. */ if (declaration_only || sym.symbol != NULL || current->declaration) { - current->searched = 0; - discard_cleanups (searched_cleanup); - if (sym.symbol != NULL) return sym; @@ -554,10 +448,7 @@ cp_lookup_symbol_via_imports (const char *scope, if (strcmp (name, *excludep) == 0) break; if (*excludep) - { - discard_cleanups (searched_cleanup); - continue; - } + continue; if (current->alias != NULL && strcmp (name, current->alias) == 0) @@ -578,15 +469,13 @@ cp_lookup_symbol_via_imports (const char *scope, name, block, domain, 1, 0, 0); } - current->searched = 0; - discard_cleanups (searched_cleanup); if (sym.symbol != NULL) return sym; } } - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; } /* Helper function that searches an array of symbols for one named NAME. */ @@ -657,8 +546,7 @@ cp_lookup_symbol_imports_or_template (const char *scope, if (SYMBOL_NATURAL_NAME (function)) { struct type *context; - char *name_copy = xstrdup (SYMBOL_NATURAL_NAME (function)); - struct cleanup *cleanups = make_cleanup (xfree, name_copy); + std::string name_copy (SYMBOL_NATURAL_NAME (function)); const struct language_defn *lang = language_def (language_cplus); struct gdbarch *arch = symbol_arch (function); const struct block *parent = BLOCK_SUPERBLOCK (block); @@ -666,15 +554,16 @@ cp_lookup_symbol_imports_or_template (const char *scope, 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'; + name_copy.erase (prefix_len); context = lookup_typename (lang, arch, - name_copy, + name_copy.c_str (), parent, 1); } @@ -687,7 +576,6 @@ cp_lookup_symbol_imports_or_template (const char *scope, TYPE_TEMPLATE_ARGUMENTS (context)); if (sym != NULL) { - do_cleanups (cleanups); if (symbol_lookup_debug) { fprintf_unfiltered @@ -698,8 +586,6 @@ cp_lookup_symbol_imports_or_template (const char *scope, return (struct block_symbol) {sym, parent}; } } - - do_cleanups (cleanups); } } @@ -734,7 +620,7 @@ cp_lookup_symbol_via_all_imports (const char *scope, const char *name, block = BLOCK_SUPERBLOCK (block); } - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; } /* Searches for NAME in the current namespace, and by applying @@ -834,7 +720,7 @@ 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); - the_namespace = alloca (scope_len + 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, @@ -922,34 +808,27 @@ find_symbol_in_baseclass (struct type *parent_type, const char *name, { int i; struct block_symbol sym; - struct cleanup *cleanup; - char *concatenated_name; sym.symbol = NULL; sym.block = NULL; - concatenated_name = NULL; - cleanup = make_cleanup (free_current_contents, &concatenated_name); 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; - len = strlen (base_name) + 2 + strlen (name) + 1; - concatenated_name = xrealloc (concatenated_name, len); - xsnprintf (concatenated_name, len, "%s::%s", base_name, name); + std::string concatenated_name = std::string (base_name) + "::" + name; - sym = cp_lookup_nested_symbol_1 (base_type, name, concatenated_name, + sym = cp_lookup_nested_symbol_1 (base_type, name, + concatenated_name.c_str (), block, domain, 1, is_in_anonymous); if (sym.symbol != NULL) break; } - do_cleanups (cleanup); return sym; } @@ -1022,7 +901,7 @@ cp_lookup_nested_symbol_1 (struct type *container_type, return sym; } - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; } /* Look up a symbol named NESTED_NAME that is nested inside the C++ @@ -1071,7 +950,7 @@ cp_lookup_nested_symbol (struct type *parent_type, 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); is_in_anonymous = cp_is_in_anonymous (concatenated_name); @@ -1099,7 +978,7 @@ cp_lookup_nested_symbol (struct type *parent_type, "cp_lookup_nested_symbol (...) = NULL" " (func/method)\n"); } - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; default: internal_error (__FILE__, __LINE__, @@ -1170,9 +1049,9 @@ cp_lookup_transparent_type_loop (const char *name, 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); @@ -1182,14 +1061,11 @@ cp_lookup_transparent_type_loop (const char *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) {