diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-07-18 12:27:16 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-09-10 08:30:45 -0600 |
| commit | aa3916548076c159ae00a922690694094a37fcd0 (patch) | |
| tree | d673c16523aed92e60f33355c100ae7290c329d3 /gdb/dwarf2read.c | |
| parent | b054970d54e141e5d2c824223772685742af2c2a (diff) | |
| download | gdb-aa3916548076c159ae00a922690694094a37fcd0.zip gdb-aa3916548076c159ae00a922690694094a37fcd0.tar.gz gdb-aa3916548076c159ae00a922690694094a37fcd0.tar.bz2 | |
Fix latent bug in .debug_names file-name handling
An internal Ada test case showed that the .debug_names code does not
compute the same list of file names as the partial symbol reader. In
particular, the partial symbol reader uses the DW_AT_name of the CU:
/* Allocate a new partial symbol table structure. */
filename = dwarf2_string_attr (comp_unit_die, DW_AT_name, cu);
if (filename == NULL)
filename = "";
pst = create_partial_symtab (per_cu, filename);
This patch changes the .debug_names reader to follow.
gdb/ChangeLog
2019-09-10 Tom Tromey <tromey@adacore.com>
* dwarf2read.c (dw2_get_file_names_reader): Add the
CU's file name to the results.
gdb/testsuite/ChangeLog
2019-09-10 Tom Tromey <tromey@adacore.com>
* gdb.ada/dgopt.exp: New file.
* gdb.ada/dgopt/x.adb: New file.
Diffstat (limited to 'gdb/dwarf2read.c')
| -rw-r--r-- | gdb/dwarf2read.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index d57684b..2379c9c 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3692,11 +3692,17 @@ dw2_get_file_names_reader (const struct die_reader_specs *reader, file_and_directory fnd = find_file_and_directory (comp_unit_die, cu); - qfn->num_file_names = lh->file_names.size (); + int offset = 0; + if (strcmp (fnd.name, "<unknown>") != 0) + ++offset; + + qfn->num_file_names = offset + lh->file_names.size (); qfn->file_names = - XOBNEWVEC (&objfile->objfile_obstack, const char *, lh->file_names.size ()); + XOBNEWVEC (&objfile->objfile_obstack, const char *, qfn->num_file_names); + if (offset != 0) + qfn->file_names[0] = xstrdup (fnd.name); for (i = 0; i < lh->file_names.size (); ++i) - qfn->file_names[i] = file_full_name (i + 1, lh.get (), fnd.comp_dir); + qfn->file_names[i + offset] = file_full_name (i + 1, lh.get (), fnd.comp_dir); qfn->real_names = NULL; lh_cu->v.quick->file_names = qfn; |