From d030267c9cc0fb594d3dda264b78114afc6eb214 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 4 Jul 2021 12:51:52 -0600 Subject: [PATCH] Simplify file_and_directory storage management file_and_directory carries a std::string in case the compilation directory is computed, but a subsequent patch wants to preserve this string without also having to maintain the storage for it. So, this patch arranges for the compilation directory string to be stored in the per-BFD string bcache instead. --- gdb/dwarf2/read.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 95246cbd023..e0007b759a2 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1533,14 +1533,10 @@ struct file_and_directory const char *name; /* The compilation directory. NULL if not known. If we needed to - compute a new string, this points to COMP_DIR_STORAGE, otherwise, - points directly to the DW_AT_comp_dir string attribute owned by - the obstack that owns the DIE. */ + compute a new string, it will be stored in the per-BFD string + bcache; otherwise, points directly to the DW_AT_comp_dir string + attribute owned by the obstack that owns the DIE. */ const char *comp_dir; - - /* If we needed to build a new string for comp_dir, this is what - owns the storage. */ - std::string comp_dir_storage; }; static file_and_directory find_file_and_directory (struct die_info *die, @@ -10387,9 +10383,10 @@ find_file_and_directory (struct die_info *die, struct dwarf2_cu *cu) && producer_is_gcc_lt_4_3 (cu) && res.name != NULL && IS_ABSOLUTE_PATH (res.name)) { - res.comp_dir_storage = ldirname (res.name); - if (!res.comp_dir_storage.empty ()) - res.comp_dir = res.comp_dir_storage.c_str (); + std::string comp_dir_storage = ldirname (res.name); + if (!comp_dir_storage.empty ()) + res.comp_dir + = cu->per_objfile->objfile->intern (comp_dir_storage.c_str ()); } if (res.comp_dir != NULL) { -- 2.30.2