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

* dwarf2read.c (read_import_statement): Don't clobber original cu.

This commit is contained in:
Cary Coutant 2009-11-09 21:39:40 +00:00
parent 86c6265d62
commit de4affc9ce
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2009-11-09 Cary Coutant <ccoutant@google.com>
* dwarf2read.c (read_import_statement): Don't clobber original cu.
2009-11-09 Tom Tromey <tromey@redhat.com>
* python/python.c (execute_gdb_command): Copy the argument text.

8
gdb/dwarf2read.c
View File

@ -3372,6 +3372,7 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
{
struct attribute *import_attr;
struct die_info *imported_die;
struct dwarf2_cu *imported_cu;
const char *imported_name;
const char *imported_name_prefix;
const char *import_prefix;
@ -3385,8 +3386,9 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
return;
}
imported_die = follow_die_ref_or_sig (die, import_attr, &cu);
imported_name = dwarf2_name (imported_die, cu);
imported_cu = cu;
imported_die = follow_die_ref_or_sig (die, import_attr, &imported_cu);
imported_name = dwarf2_name (imported_die, imported_cu);
if (imported_name == NULL)
{
/* GCC bug: https://bugzilla.redhat.com/show_bug.cgi?id=506524
@ -3431,7 +3433,7 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
/* Figure out what the scope of the imported die is and prepend it
to the name of the imported die. */
imported_name_prefix = determine_prefix (imported_die, cu);
imported_name_prefix = determine_prefix (imported_die, imported_cu);
if (strlen (imported_name_prefix) > 0)
{