From: Simon Marchi Date: Mon, 29 Apr 2024 15:08:24 +0000 (-0400) Subject: gdb: adjust includes in dwarf2/ X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2fbb7149660e6f3318ea768dee7adb340a166f0;p=thirdparty%2Fbinutils-gdb.git gdb: adjust includes in dwarf2/ For files under the dwarf2 directory: - Remove includes that are reported as unused by clangd. - Add any include required to ensure that all files include what they use. Change-Id: I2f13d75f18a390df480c6da8bdab1edba1e035e1 --- diff --git a/gdb/dwarf2/abbrev-cache.c b/gdb/dwarf2/abbrev-cache.c index b87206c2c4e..7e1ff9ceb15 100644 --- a/gdb/dwarf2/abbrev-cache.c +++ b/gdb/dwarf2/abbrev-cache.c @@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "dwarf2/read.h" #include "dwarf2/abbrev-cache.h" /* Hash function for an abbrev table. */ diff --git a/gdb/dwarf2/abbrev-cache.h b/gdb/dwarf2/abbrev-cache.h index 99d1f93f750..8c32a40e736 100644 --- a/gdb/dwarf2/abbrev-cache.h +++ b/gdb/dwarf2/abbrev-cache.h @@ -21,6 +21,8 @@ #define GDB_DWARF2_ABBREV_CACHE_H #include "dwarf2/abbrev.h" +#include "dwarf2/types.h" +#include "gdbsupport/gdb-hashtab.h" /* An abbrev cache holds abbrev tables for easier reuse. */ class abbrev_cache diff --git a/gdb/dwarf2/abbrev.c b/gdb/dwarf2/abbrev.c index 359a0094872..bae8d8b3bed 100644 --- a/gdb/dwarf2/abbrev.c +++ b/gdb/dwarf2/abbrev.c @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "dwarf2/read.h" #include "dwarf2/abbrev.h" #include "dwarf2/leb.h" +#include "dwarf2/section.h" #include "bfd.h" /* Hash function for an abbrev. */ diff --git a/gdb/dwarf2/abbrev.h b/gdb/dwarf2/abbrev.h index 1fb90fdeafa..d89983bbfcc 100644 --- a/gdb/dwarf2/abbrev.h +++ b/gdb/dwarf2/abbrev.h @@ -27,7 +27,10 @@ #ifndef GDB_DWARF2_ABBREV_H #define GDB_DWARF2_ABBREV_H -#include "hashtab.h" +#include "dwarf2.h" +#include "dwarf2/types.h" +#include "gdbsupport/gdb-hashtab.h" +#include "gdbsupport/gdb_obstack.h" struct attr_abbrev { diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h index 3b971adbe2a..115d006e271 100644 --- a/gdb/dwarf2/attribute.h +++ b/gdb/dwarf2/attribute.h @@ -29,7 +29,6 @@ #include "dwarf2.h" #include "dwarf2/types.h" -#include /* Blocks are a bunch of untyped bytes. */ struct dwarf_block diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index c9e46af32ae..e3545b55678 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -24,14 +24,17 @@ #include "cp-support.h" #include "c-lang.h" #include "ada-lang.h" +#include "dwarf2/tag.h" #include "event-top.h" #include "exceptions.h" +#include "gdbsupport/task-group.h" #include "split-name.h" #include "observable.h" #include "run-on-main-thread.h" #include #include "gdbsupport/gdb-safe-ctype.h" #include "gdbsupport/selftest.h" +#include "gdbsupport/thread-pool.h" #include #include #include "cli/cli-cmds.h" diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index d245570e34d..45862a6ce99 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -24,22 +24,16 @@ #include "dwarf2/types.h" #include "symtab.h" #include "hashtab.h" -#include "dwarf2/index-common.h" -#include #include "quick-symbol.h" #include "gdbsupport/gdb_obstack.h" #include "addrmap.h" #include "gdbsupport/iterator-range.h" -#include "gdbsupport/thread-pool.h" #include "dwarf2/mapped-index.h" #include "dwarf2/read.h" -#include "dwarf2/tag.h" #include "dwarf2/abbrev-cache.h" #include "dwarf2/parent-map.h" #include "gdbsupport/range-chain.h" -#include "gdbsupport/task-group.h" #include "complaints.h" -#include "run-on-main-thread.h" #if CXX_STD_THREAD #include diff --git a/gdb/dwarf2/dwz.h b/gdb/dwarf2/dwz.h index 5e6c1fa93a9..3ec3af1a819 100644 --- a/gdb/dwarf2/dwz.h +++ b/gdb/dwarf2/dwz.h @@ -25,6 +25,7 @@ #include "dwarf2/section.h" struct dwarf2_per_bfd; +struct dwarf2_per_objfile; /* This represents a '.dwz' file. */ diff --git a/gdb/dwarf2/frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c index c4890682274..6ecf8a0b15d 100644 --- a/gdb/dwarf2/frame-tailcall.c +++ b/gdb/dwarf2/frame-tailcall.c @@ -22,9 +22,7 @@ #include "dwarf2/frame-tailcall.h" #include "dwarf2/loc.h" #include "frame-unwind.h" -#include "block.h" #include "hashtab.h" -#include "gdbtypes.h" #include "regcache.h" #include "value.h" #include "dwarf2/frame.h" diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index 9ebf3ac4ac4..79ef065bfcb 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -25,7 +25,6 @@ #include "frame.h" #include "frame-base.h" #include "frame-unwind.h" -#include "gdbcore.h" #include "gdbtypes.h" #include "symtab.h" #include "objfiles.h" @@ -37,7 +36,6 @@ #include "dwarf2/frame.h" #include "dwarf2/read.h" #include "dwarf2/public.h" -#include "ax.h" #include "dwarf2/loc.h" #include "dwarf2/frame-tailcall.h" #include "gdbsupport/gdb_binary_search.h" diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c index 1720e925ee6..529d1ef08a5 100644 --- a/gdb/dwarf2/index-cache.c +++ b/gdb/dwarf2/index-cache.c @@ -28,8 +28,6 @@ #include "dwarf2/index-write.h" #include "dwarf2/read.h" #include "dwarf2/dwz.h" -#include "objfiles.h" -#include "gdbsupport/selftest.h" #include #include #include "run-on-main-thread.h" diff --git a/gdb/dwarf2/index-cache.h b/gdb/dwarf2/index-cache.h index 95f217ed961..08a2d56493c 100644 --- a/gdb/dwarf2/index-cache.h +++ b/gdb/dwarf2/index-cache.h @@ -20,9 +20,7 @@ #ifndef DWARF_INDEX_CACHE_H #define DWARF_INDEX_CACHE_H -#include "dwarf2/index-common.h" #include "gdbsupport/array-view.h" -#include "symfile.h" class dwarf2_per_bfd; class index_cache; diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 2a50e3b6c2d..1c2b16f131c 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -28,7 +28,6 @@ #include "gdbsupport/gdb_unlinker.h" #include "gdbsupport/pathstuff.h" #include "gdbsupport/scoped_fd.h" -#include "complaints.h" #include "dwarf2/index-common.h" #include "dwarf2/cooked-index.h" #include "dwarf2.h" @@ -43,10 +42,7 @@ #include "dwarf2/read-debug-names.h" #include -#include -#include #include -#include #include #include diff --git a/gdb/dwarf2/line-header.h b/gdb/dwarf2/line-header.h index c068dff70a3..8e5a97096f2 100644 --- a/gdb/dwarf2/line-header.h +++ b/gdb/dwarf2/line-header.h @@ -20,6 +20,8 @@ #ifndef DWARF2_LINE_HEADER_H #define DWARF2_LINE_HEADER_H +#include "dwarf2/types.h" + /* dir_index is 1-based in DWARF 4 and before, and is 0-based in DWARF 5 and later. */ typedef int dir_index; @@ -213,7 +215,7 @@ file_entry::include_dir (const line_header *lh) const and must not be freed. */ extern line_header_up dwarf_decode_line_header - (sect_offset sect_off, bool is_dwz, dwarf2_per_objfile *per_objfile, + (sect_offset sect_off, bool is_dwz, struct dwarf2_per_objfile *per_objfile, struct dwarf2_section_info *section, const struct comp_unit_head *cu_header, const char *comp_dir); diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 5fea6683575..dca0540eb74 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -41,7 +41,6 @@ #include "dwarf2/frame.h" #include "dwarf2/leb.h" #include "compile/compile.h" -#include "gdbsupport/selftest.h" #include #include #include diff --git a/gdb/dwarf2/macro.h b/gdb/dwarf2/macro.h index 586f5d5ee9a..e05f37c1480 100644 --- a/gdb/dwarf2/macro.h +++ b/gdb/dwarf2/macro.h @@ -21,16 +21,20 @@ #define GDB_DWARF2_MACRO_H struct buildsym_compunit; +struct dwarf2_cu; +struct dwarf2_per_objfile; +struct dwarf2_section_info; +struct line_header; extern void dwarf_decode_macros (dwarf2_per_objfile *per_objfile, buildsym_compunit *builder, const dwarf2_section_info *section, - const struct line_header *lh, + const line_header *lh, unsigned int offset_size, unsigned int offset, dwarf2_section_info *str_section, dwarf2_section_info *str_offsets_section, std::optional str_offsets_base, - int section_is_gnu, struct dwarf2_cu *cu); + int section_is_gnu, dwarf2_cu *cu); #endif /* GDB_DWARF2_MACRO_H */ diff --git a/gdb/dwarf2/mapped-index.h b/gdb/dwarf2/mapped-index.h index 86a3c59e7e4..9d670ade228 100644 --- a/gdb/dwarf2/mapped-index.h +++ b/gdb/dwarf2/mapped-index.h @@ -20,7 +20,9 @@ #ifndef GDB_DWARF2_MAPPED_INDEX_H #define GDB_DWARF2_MAPPED_INDEX_H +#include "dwarf2/index-common.h" #include "language.h" +#include "quick-symbol.h" /* An index into a (C++) symbol name component in a symbol name as recorded in the mapped_index's symbol table. For each C++ symbol diff --git a/gdb/dwarf2/parent-map.h b/gdb/dwarf2/parent-map.h index f070d505356..5a94bd9beff 100644 --- a/gdb/dwarf2/parent-map.h +++ b/gdb/dwarf2/parent-map.h @@ -20,7 +20,9 @@ #ifndef GDB_DWARF2_PARENT_MAP_H #define GDB_DWARF2_PARENT_MAP_H -#include +#include "addrmap.h" +#include "dwarf2/types.h" +#include "gdbsupport/gdb_obstack.h" class cooked_index_entry; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 4818da58acb..21d08b257b0 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -48,6 +48,7 @@ #include "bfd.h" #include "elf-bfd.h" #include "event-top.h" +#include "gdbsupport/task-group.h" #include "symtab.h" #include "gdbtypes.h" #include "objfiles.h" @@ -70,7 +71,6 @@ #include "go-lang.h" #include "valprint.h" #include "gdbcore.h" -#include "gdb/gdb-index.h" #include "gdb_bfd.h" #include "f-lang.h" #include "source.h" @@ -92,7 +92,6 @@ #include #include "dwarf2/abbrev-cache.h" #include "cooked-index.h" -#include "split-name.h" #include "gdbsupport/thread-pool.h" #include "run-on-main-thread.h" #include "dwarf2/parent-map.h" diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 7ab61528ab7..78fbd4d41d3 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -28,7 +28,6 @@ #include "dwarf2/mapped-index.h" #include "dwarf2/section.h" #include "dwarf2/cu.h" -#include "filename-seen-cache.h" #include "gdbsupport/gdb_obstack.h" #include "gdbsupport/hash_enum.h" #include "gdbsupport/function-view.h"