aboutsummaryrefslogtreecommitdiff
path: root/gdb/elfread.c
diff options
context:
space:
mode:
authorAndrew Burgess <aburgess@redhat.com>2023-05-05 14:22:38 +0100
committerAndrew Burgess <aburgess@redhat.com>2023-07-15 11:27:30 +0100
commit34f997c8f7475211920a8d41b6905a6da2462b28 (patch)
treea3987dae42b7a77dc574e81c65aa9a6e854222a5 /gdb/elfread.c
parentb664df49f3d07941874dce0bd991c48a37cbf409 (diff)
downloadgdb-34f997c8f7475211920a8d41b6905a6da2462b28.zip
gdb-34f997c8f7475211920a8d41b6905a6da2462b28.tar.gz
gdb-34f997c8f7475211920a8d41b6905a6da2462b28.tar.bz2
gdb: style filenames in separate debug file warnings
After the commit: commit 6647f05df023b63bbe056e9167e9e234172fa2ca Date: Tue Jan 24 18:13:38 2023 +0100 gdb: defer warnings when loading separate debug files It was pointed out[1] that the warnings being deferred and then later emitted lacked styling. The warnings lacked styling before the above commit, but it was suggested that the filenames in these warnings should be styled, and this commit does this. There were a couple of previous attempts[2][3][4] to solve this problem, but these all tried to extend the mechanism introduced in the above commit, the deferred warnings were placed directly into a std::vector, but now we tried to, when appropriate, style these warnings. The review feedback that this approach looked too complex. So instead, this revision adds a new helper class 'deferred_warnings' which can be used to collect a set of deferred warnings, and then emit these deferred warnings later, if needed. This helper class hides the complexity, so at the point the deferred warning is created no extra logic is required. The deferred_warnings class will style the deferred warnings only if gdb_stderr supports styling. GDB's warnings are sent to gdb_stderr, so this should ensure we only style when expected. There was also review feedback[5] that all of the warnings should be bundled into a single string_file, this has not been done. I feel pretty strongly that separate warnings should be emitted using separate "warning" calls. If we do end up with multiple warnings in this case they aren't really related, one will be about looking up debug via .gnu_debuglink, while the other will be about build-id based lookup. So I'd really rather keep the warnings separate. [1] https://inbox.sourceware.org/gdb-patches/87edr9pcku.fsf@tromey.com/ [2] https://inbox.sourceware.org/gdb-patches/20230216195604.2685177-1-ahajkova@redhat.com/ [3] https://inbox.sourceware.org/gdb-patches/20230217123547.2737612-1-ahajkova@redhat.com/ [4] https://inbox.sourceware.org/gdb-patches/20230320145638.1202335-1-ahajkova@redhat.com/ [5] https://inbox.sourceware.org/gdb-patches/87o7nh1g8h.fsf@tromey.com/ Co-Authored-By: Alexandra Hájková <ahajkova@redhat.com> Approved-By: Simon Marchi <simon.marchi@efficios.com>
Diffstat (limited to 'gdb/elfread.c')
-rw-r--r--gdb/elfread.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 7697106..349a8b7 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1225,14 +1225,13 @@ elf_symfile_read_dwarf2 (struct objfile *objfile,
&& objfile->separate_debug_objfile == NULL
&& objfile->separate_debug_objfile_backlink == NULL)
{
- std::vector<std::string> warnings_vector;
+ deferred_warnings warnings;
std::string debugfile
- = find_separate_debug_file_by_buildid (objfile, &warnings_vector);
+ = find_separate_debug_file_by_buildid (objfile, &warnings);
if (debugfile.empty ())
- debugfile = find_separate_debug_file_by_debuglink (objfile,
- &warnings_vector);
+ debugfile = find_separate_debug_file_by_debuglink (objfile, &warnings);
if (!debugfile.empty ())
{
@@ -1275,11 +1274,10 @@ elf_symfile_read_dwarf2 (struct objfile *objfile,
}
}
}
- /* If all the methods to collect the debuginfo failed, print
- the warnings, if there're any. */
- if (debugfile.empty () && !has_dwarf2 && !warnings_vector.empty ())
- for (const std::string &w : warnings_vector)
- warning ("%s", w.c_str ());
+ /* If all the methods to collect the debuginfo failed, print the
+ warnings, this is a no-op if there are no warnings. */
+ if (debugfile.empty () && !has_dwarf2)
+ warnings.emit ();
}
return has_dwarf2;