X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fblock.c;h=58441bfe8993c37a94cf26148bc9420eaafb0db6;hb=c1b5c1ebc938b6dc0277363b8c47d75b0b5a621f;hp=1cb98751f6429f92b6c9db6af63f2d9d2b24e0cd;hpb=358d6ab39c95691e721820fd54e9780208faf252;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/block.c b/gdb/block.c index 1cb98751f6..58441bfe89 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -1,6 +1,6 @@ /* Block-related functions for the GNU debugger, GDB. - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -25,43 +25,68 @@ #include "cp-support.h" #include "addrmap.h" #include "gdbtypes.h" +#include "objfiles.h" /* This is used by struct block to store namespace-related info for C++ files, namely using declarations and the current namespace in scope. */ -struct block_namespace_info +struct block_namespace_info : public allocate_on_obstack { - const char *scope; - struct using_direct *using; + const char *scope = nullptr; + struct using_direct *using_decl = nullptr; }; static void block_initialize_namespace (struct block *block, struct obstack *obstack); -/* Return Nonzero if block a is lexically nested within block b, - or if a and b have the same pc range. - Return zero otherwise. */ +/* See block.h. */ -int -contained_in (const struct block *a, const struct block *b) +struct objfile * +block_objfile (const struct block *block) +{ + const struct global_block *global_block; + + if (BLOCK_FUNCTION (block) != NULL) + return symbol_objfile (BLOCK_FUNCTION (block)); + + global_block = (struct global_block *) block_global_block (block); + return COMPUNIT_OBJFILE (global_block->compunit_symtab); +} + +/* See block. */ + +struct gdbarch * +block_gdbarch (const struct block *block) +{ + if (BLOCK_FUNCTION (block) != NULL) + return symbol_arch (BLOCK_FUNCTION (block)); + + return get_objfile_arch (block_objfile (block)); +} + +/* See block.h. */ + +bool +contained_in (const struct block *a, const struct block *b, + bool allow_nested) { if (!a || !b) - return 0; + return false; do { if (a == b) - return 1; + return true; /* If A is a function block, then A cannot be contained in B, except if A was inlined. */ - if (BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a)) - return 0; + if (!allow_nested && BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a)) + return false; a = BLOCK_SUPERBLOCK (a); } while (a != NULL); - return 0; + return false; } @@ -105,16 +130,16 @@ block_inlined_p (const struct block *bl) /* A helper function that checks whether PC is in the blockvector BL. It returns the containing block if there is one, or else NULL. */ -static struct block * +static const struct block * find_block_in_blockvector (const struct blockvector *bl, CORE_ADDR pc) { - struct block *b; + const struct block *b; int bot, top, half; /* If we have an addrmap mapping code addresses to blocks, then use that. */ if (BLOCKVECTOR_MAP (bl)) - return addrmap_find (BLOCKVECTOR_MAP (bl), pc); + return (const struct block *) addrmap_find (BLOCKVECTOR_MAP (bl), pc); /* Otherwise, use binary search to find the last block that starts before PC. @@ -156,20 +181,21 @@ find_block_in_blockvector (const struct blockvector *bl, CORE_ADDR pc) const struct blockvector * blockvector_for_pc_sect (CORE_ADDR pc, struct obj_section *section, - const struct block **pblock, struct symtab *symtab) + const struct block **pblock, + struct compunit_symtab *cust) { const struct blockvector *bl; - struct block *b; + const struct block *b; - if (symtab == 0) /* if no symtab specified by caller */ + if (cust == NULL) { /* First search all symtabs for one whose file contains our pc */ - symtab = find_pc_sect_symtab (pc, section); - if (symtab == 0) + cust = find_pc_sect_compunit_symtab (pc, section); + if (cust == NULL) return 0; } - bl = BLOCKVECTOR (symtab); + bl = COMPUNIT_BLOCKVECTOR (cust); /* Then search that symtab for the smallest block that wins. */ b = find_block_in_blockvector (bl, pc); @@ -196,14 +222,14 @@ blockvector_contains_pc (const struct blockvector *bv, CORE_ADDR pc) struct call_site * call_site_for_pc (struct gdbarch *gdbarch, CORE_ADDR pc) { - struct symtab *symtab; + struct compunit_symtab *cust; void **slot = NULL; /* -1 as tail call PC can be already after the compilation unit range. */ - symtab = find_pc_symtab (pc - 1); + cust = find_pc_compunit_symtab (pc - 1); - if (symtab != NULL && symtab->call_site_htab != NULL) - slot = htab_find_slot (symtab->call_site_htab, &pc, NO_INSERT); + if (cust != NULL && COMPUNIT_CALL_SITE_HTAB (cust) != NULL) + slot = htab_find_slot (COMPUNIT_CALL_SITE_HTAB (cust), &pc, NO_INSERT); if (slot == NULL) { @@ -212,14 +238,14 @@ call_site_for_pc (struct gdbarch *gdbarch, CORE_ADDR pc) /* DW_TAG_gnu_call_site will be missing just if GCC could not determine the call target. */ throw_error (NO_ENTRY_VALUE_ERROR, - _("DW_OP_GNU_entry_value resolving cannot find " - "DW_TAG_GNU_call_site %s in %s"), + _("DW_OP_entry_value resolving cannot find " + "DW_TAG_call_site %s in %s"), paddress (gdbarch, pc), (msym.minsym == NULL ? "???" - : MSYMBOL_PRINT_NAME (msym.minsym))); + : msym.minsym->print_name ())); } - return *slot; + return (struct call_site *) *slot; } /* Return the blockvector immediately containing the innermost lexical block @@ -299,7 +325,7 @@ block_using (const struct block *block) if (block == NULL || BLOCK_NAMESPACE (block) == NULL) return NULL; else - return BLOCK_NAMESPACE (block)->using; + return BLOCK_NAMESPACE (block)->using_decl; } /* Set BLOCK's using member to USING; if needed, allocate memory via @@ -308,27 +334,22 @@ block_using (const struct block *block) void block_set_using (struct block *block, - struct using_direct *using, + struct using_direct *using_decl, struct obstack *obstack) { block_initialize_namespace (block, obstack); - BLOCK_NAMESPACE (block)->using = using; + BLOCK_NAMESPACE (block)->using_decl = using_decl; } /* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and - ititialize its members to zero. */ + initialize its members to zero. */ static void block_initialize_namespace (struct block *block, struct obstack *obstack) { if (BLOCK_NAMESPACE (block) == NULL) - { - BLOCK_NAMESPACE (block) - = obstack_alloc (obstack, sizeof (struct block_namespace_info)); - BLOCK_NAMESPACE (block)->scope = NULL; - BLOCK_NAMESPACE (block)->using = NULL; - } + BLOCK_NAMESPACE (block) = new (obstack) struct block_namespace_info (); } /* Return the static block associated to BLOCK. Return NULL if block @@ -365,9 +386,9 @@ block_global_block (const struct block *block) zero/NULL. This is useful for creating "dummy" blocks that don't correspond to actual source files. - Warning: it sets the block's BLOCK_DICT to NULL, which isn't a + Warning: it sets the block's BLOCK_MULTIDICT to NULL, which isn't a valid value. If you really don't want the block to have a - dictionary, then you should subsequently set its BLOCK_DICT to + dictionary, then you should subsequently set its BLOCK_MULTIDICT to dict_create_linear (obstack, NULL). */ struct block * @@ -388,30 +409,45 @@ allocate_global_block (struct obstack *obstack) return &bl->block; } -/* Set the symtab of the global block. */ +/* Set the compunit of the global block. */ void -set_block_symtab (struct block *block, struct symtab *symtab) +set_block_compunit_symtab (struct block *block, struct compunit_symtab *cu) { struct global_block *gb; gdb_assert (BLOCK_SUPERBLOCK (block) == NULL); gb = (struct global_block *) block; - gdb_assert (gb->symtab == NULL); - gb->symtab = symtab; + gdb_assert (gb->compunit_symtab == NULL); + gb->compunit_symtab = cu; +} + +/* See block.h. */ + +struct dynamic_prop * +block_static_link (const struct block *block) +{ + struct objfile *objfile = block_objfile (block); + + /* Only objfile-owned blocks that materialize top function scopes can have + static links. */ + if (objfile == NULL || BLOCK_FUNCTION (block) == NULL) + return NULL; + + return (struct dynamic_prop *) objfile_lookup_static_link (objfile, block); } -/* Return the symtab of the global block. */ +/* Return the compunit of the global block. */ -static struct symtab * -get_block_symtab (const struct block *block) +static struct compunit_symtab * +get_block_compunit_symtab (const struct block *block) { struct global_block *gb; gdb_assert (BLOCK_SUPERBLOCK (block) == NULL); gb = (struct global_block *) block; - gdb_assert (gb->symtab != NULL); - return gb->symtab; + gdb_assert (gb->compunit_symtab != NULL); + return gb->compunit_symtab; } @@ -425,19 +461,19 @@ initialize_block_iterator (const struct block *block, struct block_iterator *iter) { enum block_enum which; - struct symtab *symtab; + struct compunit_symtab *cu; iter->idx = -1; if (BLOCK_SUPERBLOCK (block) == NULL) { which = GLOBAL_BLOCK; - symtab = get_block_symtab (block); + cu = get_block_compunit_symtab (block); } else if (BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) == NULL) { which = STATIC_BLOCK; - symtab = get_block_symtab (BLOCK_SUPERBLOCK (block)); + cu = get_block_compunit_symtab (BLOCK_SUPERBLOCK (block)); } else { @@ -450,14 +486,14 @@ initialize_block_iterator (const struct block *block, /* If this is an included symtab, find the canonical includer and use it instead. */ - while (symtab->user != NULL) - symtab = symtab->user; + while (cu->user != NULL) + cu = cu->user; /* Putting this check here simplifies the logic of the iterator functions. If there are no included symtabs, we only need to search a single block, so we might as well just do that directly. */ - if (symtab->includes == NULL) + if (cu->includes == NULL) { iter->d.block = block; /* A signal value meaning that we're iterating over a single @@ -466,20 +502,20 @@ initialize_block_iterator (const struct block *block, } else { - iter->d.symtab = symtab; + iter->d.compunit_symtab = cu; iter->which = which; } } -/* A helper function that finds the current symtab over whose static +/* A helper function that finds the current compunit over whose static or global block we should iterate. */ -static struct symtab * -find_iterator_symtab (struct block_iterator *iterator) +static struct compunit_symtab * +find_iterator_compunit_symtab (struct block_iterator *iterator) { if (iterator->idx == -1) - return iterator->d.symtab; - return iterator->d.symtab->includes[iterator->idx]; + return iterator->d.compunit_symtab; + return iterator->d.compunit_symtab->includes[iterator->idx]; } /* Perform a single step for a plain block iterator, iterating across @@ -497,18 +533,21 @@ block_iterator_step (struct block_iterator *iterator, int first) { if (first) { - struct symtab *symtab = find_iterator_symtab (iterator); + struct compunit_symtab *cust + = find_iterator_compunit_symtab (iterator); const struct block *block; /* Iteration is complete. */ - if (symtab == NULL) + if (cust == NULL) return NULL; - block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), iterator->which); - sym = dict_iterator_first (BLOCK_DICT (block), &iterator->dict_iter); + block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), + iterator->which); + sym = mdict_iterator_first (BLOCK_MULTIDICT (block), + &iterator->mdict_iter); } else - sym = dict_iterator_next (&iterator->dict_iter); + sym = mdict_iterator_next (&iterator->mdict_iter); if (sym != NULL) return sym; @@ -530,7 +569,7 @@ block_iterator_first (const struct block *block, initialize_block_iterator (block, iterator); if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iterator_first (block->dict, &iterator->dict_iter); + return mdict_iterator_first (block->multidict, &iterator->mdict_iter); return block_iterator_step (iterator, 1); } @@ -541,18 +580,19 @@ struct symbol * block_iterator_next (struct block_iterator *iterator) { if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iterator_next (&iterator->dict_iter); + return mdict_iterator_next (&iterator->mdict_iter); return block_iterator_step (iterator, 0); } -/* Perform a single step for a "name" block iterator, iterating across - symbol tables as needed. Returns the next symbol, or NULL when - iteration is complete. */ +/* Perform a single step for a "match" block iterator, iterating + across symbol tables as needed. Returns the next symbol, or NULL + when iteration is complete. */ static struct symbol * -block_iter_name_step (struct block_iterator *iterator, const char *name, - int first) +block_iter_match_step (struct block_iterator *iterator, + const lookup_name_info &name, + int first) { struct symbol *sym; @@ -562,19 +602,21 @@ block_iter_name_step (struct block_iterator *iterator, const char *name, { if (first) { - struct symtab *symtab = find_iterator_symtab (iterator); + struct compunit_symtab *cust + = find_iterator_compunit_symtab (iterator); const struct block *block; /* Iteration is complete. */ - if (symtab == NULL) + if (cust == NULL) return NULL; - block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), iterator->which); - sym = dict_iter_name_first (BLOCK_DICT (block), name, - &iterator->dict_iter); + block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), + iterator->which); + sym = mdict_iter_match_first (BLOCK_MULTIDICT (block), name, + &iterator->mdict_iter); } else - sym = dict_iter_name_next (name, &iterator->dict_iter); + sym = mdict_iter_match_next (name, &iterator->mdict_iter); if (sym != NULL) return sym; @@ -590,100 +632,66 @@ block_iter_name_step (struct block_iterator *iterator, const char *name, /* See block.h. */ struct symbol * -block_iter_name_first (const struct block *block, - const char *name, - struct block_iterator *iterator) +block_iter_match_first (const struct block *block, + const lookup_name_info &name, + struct block_iterator *iterator) { initialize_block_iterator (block, iterator); if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iter_name_first (block->dict, name, &iterator->dict_iter); + return mdict_iter_match_first (block->multidict, name, + &iterator->mdict_iter); - return block_iter_name_step (iterator, name, 1); + return block_iter_match_step (iterator, name, 1); } /* See block.h. */ struct symbol * -block_iter_name_next (const char *name, struct block_iterator *iterator) +block_iter_match_next (const lookup_name_info &name, + struct block_iterator *iterator) { if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iter_name_next (name, &iterator->dict_iter); + return mdict_iter_match_next (name, &iterator->mdict_iter); - return block_iter_name_step (iterator, name, 0); + return block_iter_match_step (iterator, name, 0); } -/* Perform a single step for a "match" block iterator, iterating - across symbol tables as needed. Returns the next symbol, or NULL - when iteration is complete. */ +/* Return true if symbol A is the best match possible for DOMAIN. */ -static struct symbol * -block_iter_match_step (struct block_iterator *iterator, - const char *name, - symbol_compare_ftype *compare, - int first) +static bool +best_symbol (struct symbol *a, const domain_enum domain) { - struct symbol *sym; - - gdb_assert (iterator->which != FIRST_LOCAL_BLOCK); - - while (1) - { - if (first) - { - struct symtab *symtab = find_iterator_symtab (iterator); - const struct block *block; - - /* Iteration is complete. */ - if (symtab == NULL) - return NULL; - - block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), iterator->which); - sym = dict_iter_match_first (BLOCK_DICT (block), name, - compare, &iterator->dict_iter); - } - else - sym = dict_iter_match_next (name, compare, &iterator->dict_iter); - - if (sym != NULL) - return sym; - - /* We have finished iterating the appropriate block of one - symtab. Now advance to the next symtab and begin iteration - there. */ - ++iterator->idx; - first = 1; - } + return (SYMBOL_DOMAIN (a) == domain + && SYMBOL_CLASS (a) != LOC_UNRESOLVED); } -/* See block.h. */ +/* Return symbol B if it is a better match than symbol A for DOMAIN. + Otherwise return A. */ -struct symbol * -block_iter_match_first (const struct block *block, - const char *name, - symbol_compare_ftype *compare, - struct block_iterator *iterator) +static struct symbol * +better_symbol (struct symbol *a, struct symbol *b, const domain_enum domain) { - initialize_block_iterator (block, iterator); - - if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iter_match_first (block->dict, name, compare, - &iterator->dict_iter); - - return block_iter_match_step (iterator, name, compare, 1); -} + if (a == NULL) + return b; + if (b == NULL) + return a; -/* See block.h. */ + if (SYMBOL_DOMAIN (a) == domain + && SYMBOL_DOMAIN (b) != domain) + return a; + if (SYMBOL_DOMAIN (b) == domain + && SYMBOL_DOMAIN (a) != domain) + return b; -struct symbol * -block_iter_match_next (const char *name, - symbol_compare_ftype *compare, - struct block_iterator *iterator) -{ - if (iterator->which == FIRST_LOCAL_BLOCK) - return dict_iter_match_next (name, compare, &iterator->dict_iter); + if (SYMBOL_CLASS (a) != LOC_UNRESOLVED + && SYMBOL_CLASS (b) == LOC_UNRESOLVED) + return a; + if (SYMBOL_CLASS (b) != LOC_UNRESOLVED + && SYMBOL_CLASS (a) == LOC_UNRESOLVED) + return b; - return block_iter_match_step (iterator, name, compare, 0); + return a; } /* See block.h. @@ -699,20 +707,33 @@ block_iter_match_next (const char *name, struct symbol * block_lookup_symbol (const struct block *block, const char *name, + symbol_name_match_type match_type, const domain_enum domain) { struct block_iterator iter; struct symbol *sym; + lookup_name_info lookup_name (name, match_type); + if (!BLOCK_FUNCTION (block)) { - ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym) + struct symbol *other = NULL; + + ALL_BLOCK_SYMBOLS_WITH_NAME (block, lookup_name, iter, sym) { - if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), - SYMBOL_DOMAIN (sym), domain)) + /* See comment related to PR gcc/debug/91507 in + block_lookup_symbol_primary. */ + if (best_symbol (sym, domain)) return sym; + /* This is a bit of a hack, but symbol_matches_domain might ignore + STRUCT vs VAR domain symbols. So if a matching symbol is found, + make sure there is no "better" matching symbol, i.e., one with + exactly the same domain. PR 16253. */ + if (symbol_matches_domain (sym->language (), + SYMBOL_DOMAIN (sym), domain)) + other = better_symbol (other, sym, domain); } - return NULL; + return other; } else { @@ -720,13 +741,16 @@ block_lookup_symbol (const struct block *block, const char *name, list; this loop makes sure to take anything else other than parameter symbols first; it only uses parameter symbols as a last resort. Note that this only takes up extra computation - time on a match. */ + time on a match. + It's hard to define types in the parameter list (at least in + C/C++) so we don't do the same PR 16253 hack here that is done + for the !BLOCK_FUNCTION case. */ struct symbol *sym_found = NULL; - ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym) + ALL_BLOCK_SYMBOLS_WITH_NAME (block, lookup_name, iter, sym) { - if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), + if (symbol_matches_domain (sym->language (), SYMBOL_DOMAIN (sym), domain)) { sym_found = sym; @@ -739,3 +763,134 @@ block_lookup_symbol (const struct block *block, const char *name, return (sym_found); /* Will be NULL if not found. */ } } + +/* See block.h. */ + +struct symbol * +block_lookup_symbol_primary (const struct block *block, const char *name, + const domain_enum domain) +{ + struct symbol *sym, *other; + struct mdict_iterator mdict_iter; + + lookup_name_info lookup_name (name, symbol_name_match_type::FULL); + + /* Verify BLOCK is STATIC_BLOCK or GLOBAL_BLOCK. */ + gdb_assert (BLOCK_SUPERBLOCK (block) == NULL + || BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) == NULL); + + other = NULL; + for (sym + = mdict_iter_match_first (block->multidict, lookup_name, &mdict_iter); + sym != NULL; + sym = mdict_iter_match_next (lookup_name, &mdict_iter)) + { + /* With the fix for PR gcc/debug/91507, we get for: + ... + extern char *zzz[]; + char *zzz[ ] = { + "abc", + "cde" + }; + ... + DWARF which will result in two entries in the symbol table, a decl + with type char *[] and a def with type char *[2]. + + If we return the decl here, we don't get the value of zzz: + ... + $ gdb a.spec.out -batch -ex "p zzz" + $1 = 0x601030 + ... + because we're returning the symbol without location information, and + because the fallback that uses the address from the minimal symbols + doesn't work either because the type of the decl does not specify a + size. + + To fix this, we prefer def over decl in best_symbol and + better_symbol. + + In absence of the gcc fix, both def and decl have type char *[], so + the only option to make this work is improve the fallback to use the + size of the minimal symbol. Filed as PR exp/24989. */ + if (best_symbol (sym, domain)) + return sym; + + /* This is a bit of a hack, but symbol_matches_domain might ignore + STRUCT vs VAR domain symbols. So if a matching symbol is found, + make sure there is no "better" matching symbol, i.e., one with + exactly the same domain. PR 16253. */ + if (symbol_matches_domain (sym->language (), SYMBOL_DOMAIN (sym), domain)) + other = better_symbol (other, sym, domain); + } + + return other; +} + +/* See block.h. */ + +struct symbol * +block_find_symbol (const struct block *block, const char *name, + const domain_enum domain, + block_symbol_matcher_ftype *matcher, void *data) +{ + struct block_iterator iter; + struct symbol *sym; + + lookup_name_info lookup_name (name, symbol_name_match_type::FULL); + + /* Verify BLOCK is STATIC_BLOCK or GLOBAL_BLOCK. */ + gdb_assert (BLOCK_SUPERBLOCK (block) == NULL + || BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) == NULL); + + ALL_BLOCK_SYMBOLS_WITH_NAME (block, lookup_name, iter, sym) + { + /* MATCHER is deliberately called second here so that it never sees + a non-domain-matching symbol. */ + if (symbol_matches_domain (sym->language (), SYMBOL_DOMAIN (sym), domain) + && matcher (sym, data)) + return sym; + } + return NULL; +} + +/* See block.h. */ + +int +block_find_non_opaque_type (struct symbol *sym, void *data) +{ + return !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)); +} + +/* See block.h. */ + +int +block_find_non_opaque_type_preferred (struct symbol *sym, void *data) +{ + struct symbol **best = (struct symbol **) data; + + if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym))) + return 1; + *best = sym; + return 0; +} + +/* See block.h. */ + +struct blockranges * +make_blockranges (struct objfile *objfile, + const std::vector &rangevec) +{ + struct blockranges *blr; + size_t n = rangevec.size(); + + blr = (struct blockranges *) + obstack_alloc (&objfile->objfile_obstack, + sizeof (struct blockranges) + + (n - 1) * sizeof (struct blockrange)); + + blr->nranges = n; + for (int i = 0; i < n; i++) + blr->range[i] = rangevec[i]; + return blr; +} +