X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fcp-namespace.c;h=5b352d1d77be8f092719c3926af170947ce313f8;hb=96a86c01d119372f4af5aff2501d3104e6c1a8e3;hp=d8817c03726d55291cb2d9491bc6a2aa5bf26674;hpb=167b0be1b5ef36a5605fcdfba0c84db2ed475e1e;p=binutils-gdb.git diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index d8817c03726..5b352d1d77b 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-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2019 Free Software Foundation, Inc. Contributed by David Carlton and by Kealia, Inc. @@ -50,7 +50,8 @@ static struct type *cp_lookup_transparent_type_loop (const char *name, 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) @@ -94,9 +95,9 @@ cp_scan_for_anonymous_namespaces (const struct symbol *const symbol, namespace given by the previous component if there is one, or to the global namespace if there isn't. */ std::vector excludes; - add_using_directive (&local_using_directives, - dest, src, NULL, NULL, excludes, 1, - &objfile->objfile_obstack); + 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; @@ -141,7 +142,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; } } @@ -214,7 +217,7 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, lang_this = lookup_language_this (langdef, block); if (lang_this.symbol == NULL) - return null_block_symbol; + return {}; type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol))); @@ -222,7 +225,7 @@ cp_lookup_bare_symbol (const struct language_defn *langdef, This can happen for lambda functions compiled with clang++, which outputs no name for the container class. */ if (TYPE_NAME (type) == NULL) - return null_block_symbol; + return {}; /* Look for symbol NAME in this class. */ sym = cp_lookup_nested_symbol (type, name, block, domain); @@ -249,7 +252,7 @@ cp_search_static_and_baseclasses (const char *name, { /* Check for malformed input. */ if (prefix_len + 2 > strlen (name) || name[prefix_len + 1] != ':') - return null_block_symbol; + return {}; /* The class, namespace or function name is everything up to and including PREFIX_LEN. */ @@ -269,7 +272,7 @@ cp_search_static_and_baseclasses (const char *name, 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; + return {}; struct type *scope_type = SYMBOL_TYPE (scope_sym.symbol); @@ -376,13 +379,10 @@ cp_lookup_symbol_via_imports (const char *scope, const int search_parents) { struct using_direct *current; - struct block_symbol sym; + struct block_symbol sym = {}; int len; int directive_match; - 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, @@ -473,7 +473,7 @@ cp_lookup_symbol_via_imports (const char *scope, } } - return null_block_symbol; + return {}; } /* Helper function that searches an array of symbols for one named NAME. */ @@ -618,7 +618,7 @@ cp_lookup_symbol_via_all_imports (const char *scope, const char *name, block = BLOCK_SUPERBLOCK (block); } - return null_block_symbol; + return {}; } /* Searches for NAME in the current namespace, and by applying @@ -805,10 +805,7 @@ find_symbol_in_baseclass (struct type *parent_type, const char *name, int is_in_anonymous) { int i; - struct block_symbol sym; - - sym.symbol = NULL; - sym.block = NULL; + struct block_symbol sym = {}; for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i) { @@ -899,7 +896,7 @@ cp_lookup_nested_symbol_1 (struct type *container_type, return sym; } - return null_block_symbol; + return {}; } /* Look up a symbol named NESTED_NAME that is nested inside the C++ @@ -913,7 +910,7 @@ cp_lookup_nested_symbol (struct type *parent_type, 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; @@ -921,7 +918,7 @@ cp_lookup_nested_symbol (struct type *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, %s)\n", @@ -942,7 +939,7 @@ cp_lookup_nested_symbol (struct type *parent_type, case TYPE_CODE_MODULE: { int size; - const char *parent_name = type_name_no_tag_or_error (saved_parent_type); + const char *parent_name = type_name_or_error (saved_parent_type); struct block_symbol sym; char *concatenated_name; int is_in_anonymous; @@ -976,7 +973,7 @@ cp_lookup_nested_symbol (struct type *parent_type, "cp_lookup_nested_symbol (...) = NULL" " (func/method)\n"); } - return null_block_symbol; + return {}; default: internal_error (__FILE__, __LINE__, @@ -1049,7 +1046,7 @@ cp_lookup_transparent_type_loop (const char *name, 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);