From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Subject: [PATCH v3 4/7] gdb/dwarf: pass a file_entry to line_header::file_file_name
Date: Wed, 27 Apr 2022 23:35:39 -0400 [thread overview]
Message-ID: <20220428033542.1636284-5-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20220428033542.1636284-1-simon.marchi@polymtl.ca>
In the following patch, there will be some callers of file_file_name
that will already have access to the file_entry object for which they
want the file name. It would be inefficient to have them pass an index,
only for line_header::file_file_name to re-lookup the same file_entry
object. Change line_header::file_file_name to accept a file_entry
object reference, instead of an index to look up.
I think this change makes sense in any case. Callers that have an index
can first obtain a file_entry using line_header::file_name_at or
line_header::file_names.
When passing a file_entry object, we can assume that the file_entry's
index is valid, unlike when passing an index. So, push the special case
about an invalid index to the sole current caller of file_file_name,
macro_start_file. I think that error belongs there anyway, since it
specifically talks about "bad file number in macro information".
This requires recording the file index in the file_entry structure, so
add that.
Change-Id: Ic6e44c407539d92b7863d7ba82405ade17f384ad
---
| 47 ++++++++++++----------------------------
| 10 ++++++---
gdb/dwarf2/macro.c | 16 +++++++++++++-
3 files changed, 36 insertions(+), 37 deletions(-)
--git a/gdb/dwarf2/line-header.c b/gdb/dwarf2/line-header.c
index 13379851b9b6..33af77d3ecf3 100644
--- a/gdb/dwarf2/line-header.c
+++ b/gdb/dwarf2/line-header.c
@@ -48,47 +48,28 @@ line_header::add_file_name (const char *name,
unsigned int mod_time,
unsigned int length)
{
+ file_name_index index
+ = version >= 5 ? file_names_size (): file_names_size () + 1;
+
if (dwarf_line_debug >= 2)
- {
- size_t new_size;
- if (version >= 5)
- new_size = file_names_size ();
- else
- new_size = file_names_size () + 1;
- gdb_printf (gdb_stdlog, "Adding file %zu: %s\n",
- new_size, name);
- }
- m_file_names.emplace_back (name, d_index, mod_time, length);
+ gdb_printf (gdb_stdlog, "Adding file %d: %s\n", index, name);
+
+ m_file_names.emplace_back (name, index, d_index, mod_time, length);
}
std::string
-line_header::file_file_name (int file) const
+line_header::file_file_name (const file_entry &fe) const
{
- /* Is the file number a valid index into the line header's file name
- table? Remember that file numbers start with one, not zero. */
- if (is_valid_file_index (file))
- {
- const file_entry *fe = file_name_at (file);
+ gdb_assert (is_valid_file_index (fe.index));
- if (!IS_ABSOLUTE_PATH (fe->name))
- {
- const char *dir = fe->include_dir (this);
- if (dir != NULL)
- return path_join (dir, fe->name);
- }
+ if (IS_ABSOLUTE_PATH (fe.name))
+ return fe.name;
- return fe->name;
- }
- else
- {
- /* The compiler produced a bogus file number. We can at least
- record the macro definitions made in the file, even if we
- won't be able to find the file by name. */
- complaint (_("bad file number in macro information (%d)"),
- file);
+ const char *dir = fe.include_dir (this);
+ if (dir != nullptr)
+ return path_join (dir, fe.name);
- return string_printf ("<bad macro file number %d>", file);
- }
+ return fe.name;
}
static void
--git a/gdb/dwarf2/line-header.h b/gdb/dwarf2/line-header.h
index 53db3a1d5aa8..0fe539b0c427 100644
--- a/gdb/dwarf2/line-header.h
+++ b/gdb/dwarf2/line-header.h
@@ -36,9 +36,10 @@ struct file_entry
{
file_entry () = default;
- file_entry (const char *name_, dir_index d_index_,
+ file_entry (const char *name_, file_name_index index_, dir_index d_index_,
unsigned int mod_time_, unsigned int length_)
: name (name_),
+ index (index_),
d_index (d_index_),
mod_time (mod_time_),
length (length_)
@@ -52,6 +53,9 @@ struct file_entry
owned by debug_line_buffer. */
const char *name {};
+ /* The index of this file in the file table. */
+ file_name_index index {};
+
/* The directory index (1-based). */
dir_index d_index {};
@@ -168,8 +172,8 @@ struct line_header
const gdb_byte *statement_program_start {}, *statement_program_end {};
/* Return file name relative to the compilation directory of file
- number FILE in this object's file name table. */
- std::string file_file_name (int file) const;
+ FE in this object's file name table. */
+ std::string file_file_name (const file_entry &fe) const;
/* Return the compilation directory of the compilation unit in the context of
which this line header is read. Return nullptr if non applicable. */
diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index 99c3653a2c3a..38c0fdfec738 100644
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -52,7 +52,21 @@ macro_start_file (buildsym_compunit *builder,
const struct line_header *lh)
{
/* File name relative to the compilation directory of this source file. */
- std::string file_name = lh->file_file_name (file);
+ const file_entry *fe = lh->file_name_at (file);
+ std::string file_name;
+
+ if (fe != nullptr)
+ file_name = lh->file_file_name (*fe);
+ else
+ {
+ /* The compiler produced a bogus file number. We can at least
+ record the macro definitions made in the file, even if we
+ won't be able to find the file by name. */
+ complaint (_("bad file number in macro information (%d)"),
+ file);
+
+ file_name = string_printf ("<bad macro file number %d>", file);
+ }
if (! current_file)
{
--
2.35.2
next prev parent reply other threads:[~2022-04-28 3:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 3:35 [PATCH v3 0/7] Fix printing macros Simon Marchi
2022-04-28 3:35 ` [PATCH v3 1/7] gdb: introduce symtab_create_debug_printf Simon Marchi
2022-04-28 15:49 ` Tom Tromey
2022-04-28 3:35 ` [PATCH v3 2/7] gdb: add debug prints in buildsym.c Simon Marchi
2022-04-28 15:50 ` Tom Tromey
2022-04-28 3:35 ` [PATCH v3 3/7] gdb/dwarf: pass compilation directory to line header Simon Marchi
2022-04-28 15:48 ` Tom Tromey
2022-04-28 15:59 ` Simon Marchi
2022-04-28 3:35 ` Simon Marchi [this message]
2022-05-03 20:12 ` [PATCH v3 4/7] gdb/dwarf: pass a file_entry to line_header::file_file_name Bruno Larsen
2022-07-28 16:26 ` Simon Marchi
2022-04-28 3:35 ` [PATCH v3 5/7] gdb: add "id" fields to identify symtabs and subfiles Simon Marchi
2022-04-28 23:53 ` Lancelot SIX
2022-07-28 17:46 ` Simon Marchi
2022-04-28 3:35 ` [PATCH v3 6/7] gdb: remove code to prepend comp dir in buildsym_compunit::start_subfile Simon Marchi
2022-05-12 13:07 ` Bruno Larsen
2022-07-28 17:47 ` Simon Marchi
2022-04-28 3:35 ` [PATCH v3 7/7] gdb/testsuite: add macros test for source files compiled in various ways Simon Marchi
2022-05-12 13:17 ` Bruno Larsen
2022-07-28 17:51 ` Simon Marchi
2022-07-30 0:56 ` [PATCH v3 0/7] Fix printing macros Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220428033542.1636284-5-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).