OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* cp-namespace.c (cp_scan_for_anonymous_namespaces): Changed function

Browse Source 
arguments by adding OBJFILE.  Instead of getting objfile from
	symbol's symtab, use new argument OBJFILE.
	* cp-support.h (cp_scan_for_anonymous_namespaces): Changed function
	arguments by adding OBJFILE.
	* gdb/dwarf2read.c (new_symbol_full): Change call to
	cp_scan_for_anonymous_namespaces to match new signature.
	* gdb/stabsread.c (define_symbol): Change call to
	cp_scan_for_anonymous_namespaces to match new signature.
This commit is contained in:
Aleksandar Ristovski 2011-10-20 20:06:14 +00:00
parent 9553db3cc3
commit a10964d12c
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@ -1,3 +1,15 @@
2011-10-20 Aleksandar Ristovski <aristovski@qnx.com>
* cp-namespace.c (cp_scan_for_anonymous_namespaces): Changed function
arguments by adding OBJFILE. Instead of getting objfile from
symbol's symtab, use new argument OBJFILE.
* cp-support.h (cp_scan_for_anonymous_namespaces): Changed function
arguments by adding OBJFILE.
* gdb/dwarf2read.c (new_symbol_full): Change call to
cp_scan_for_anonymous_namespaces to match new signature.
* gdb/stabsread.c (define_symbol): Change call to
cp_scan_for_anonymous_namespaces to match new signature.
2011-10-20 Phil Muldoon <pmuldoon@redhat.com> 2011-10-20 Phil Muldoon <pmuldoon@redhat.com>
PR python/13308 PR python/13308

5
gdb/cp-namespace.c
View File

@ -53,7 +53,8 @@ static struct type *cp_lookup_transparent_type_loop (const char *name,
anonymous namespace; if so, add an appropriate using directive. */ anonymous namespace; if so, add an appropriate using directive. */
void void
cp_scan_for_anonymous_namespaces (const struct symbol *symbol) cp_scan_for_anonymous_namespaces (const struct symbol *const symbol,
struct objfile *const objfile)
{ {
if (SYMBOL_DEMANGLED_NAME (symbol) != NULL) if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
{ {
@ -96,7 +97,7 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
namespace given by the previous component if there is namespace given by the previous component if there is
one, or to the global namespace if there isn't. */ one, or to the global namespace if there isn't. */
cp_add_using_directive (dest, src, NULL, NULL, NULL, cp_add_using_directive (dest, src, NULL, NULL, NULL,
&SYMBOL_SYMTAB (symbol)->objfile->objfile_obstack); &objfile->objfile_obstack);
} }
/* The "+ 2" is for the "::". */ /* The "+ 2" is for the "::". */
previous_component = next_component + 2; previous_component = next_component + 2;

3
gdb/cp-support.h
View File

@ -197,7 +197,8 @@ extern void cp_set_block_scope (const struct symbol *symbol,
const char *processing_current_prefix, const char *processing_current_prefix,
int processing_has_namespace_info); int processing_has_namespace_info);
extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol); extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol,
struct objfile *objfile);
extern struct symbol *cp_lookup_symbol_nonlocal (const char *name, extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
const struct block *block, const struct block *block,

2
gdb/dwarf2read.c
View File

@ -11992,7 +11992,7 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
namespaces based on the demangled name. */ namespaces based on the demangled name. */
if (!processing_has_namespace_info if (!processing_has_namespace_info
&& cu->language == language_cplus) && cu->language == language_cplus)
cp_scan_for_anonymous_namespaces (sym); cp_scan_for_anonymous_namespaces (sym, objfile);
} }
return (sym); return (sym);
} }

2
gdb/stabsread.c
View File

@ -729,7 +729,7 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
SYMBOL_SET_NAMES (sym, string, p - string, 1, objfile); SYMBOL_SET_NAMES (sym, string, p - string, 1, objfile);
if (SYMBOL_LANGUAGE (sym) == language_cplus) if (SYMBOL_LANGUAGE (sym) == language_cplus)
cp_scan_for_anonymous_namespaces (sym); cp_scan_for_anonymous_namespaces (sym, objfile);
} }
p++; p++;