X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-namespace.c;h=016a42f5883a298febb6d2f1eb001ec722549e1c;hb=39a0d071ae10ab953d6bb986ec40996c771db78f;hp=f5f4bad878de10f3ea43ccbdacb719255c3ebce4;hpb=1da03605ced73fc20f40ad649f3038e654d36dee;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index f5f4bad878..016a42f588 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-2016 Free Software Foundation, Inc. Contributed by David Carlton and by Kealia, Inc. @@ -31,6 +31,7 @@ #include "frame.h" #include "buildsym.h" #include "language.h" +#include "namespace.h" static struct block_symbol cp_lookup_nested_symbol_1 (struct type *container_type, @@ -78,8 +79,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 +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; @@ -103,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 *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. */ @@ -264,7 +170,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) @@ -302,14 +208,14 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, lang_this = lookup_language_this (language_def (language_cplus), 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); @@ -340,10 +246,9 @@ cp_search_static_and_baseclasses (const char *name, 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] == ':'); + /* Check for malformed input. */ + if (prefix_len + 2 > strlen (name) || name[prefix_len + 1] != ':') + return null_block_symbol; /* Find the name of the class and the name of the method, variable, etc. */ @@ -367,7 +272,7 @@ cp_search_static_and_baseclasses (const char *name, if (klass_sym.symbol == NULL) { do_cleanups (cleanup); - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; } klass_type = SYMBOL_TYPE (klass_sym.symbol); @@ -402,8 +307,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); @@ -437,7 +342,7 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, static void reset_directive_searched (void *data) { - struct using_direct *direct = data; + struct using_direct *direct = (struct using_direct *) data; direct->searched = 0; } @@ -586,7 +491,7 @@ cp_lookup_symbol_via_imports (const char *scope, } } - return (struct block_symbol) {NULL, NULL}; + return null_block_symbol; } /* Helper function that searches an array of symbols for one named NAME. */ @@ -734,7 +639,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 +739,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, @@ -940,7 +845,7 @@ find_symbol_in_baseclass (struct type *parent_type, const char *name, continue; len = strlen (base_name) + 2 + strlen (name) + 1; - concatenated_name = xrealloc (concatenated_name, len); + concatenated_name = (char *) xrealloc (concatenated_name, len); xsnprintf (concatenated_name, len, "%s::%s", base_name, name); sym = cp_lookup_nested_symbol_1 (base_type, name, concatenated_name, @@ -1022,7 +927,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 +976,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 +1004,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,7 +1075,7 @@ 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); strcpy (full_name + scope_length + 2, name);