diff options
| -rw-r--r-- | gdb/dwarf2/file-and-dir.h | 8 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gdb/dwarf2/file-and-dir.h b/gdb/dwarf2/file-and-dir.h index 1a9ccf3..c56922f 100644 --- a/gdb/dwarf2/file-and-dir.h +++ b/gdb/dwarf2/file-and-dir.h @@ -84,9 +84,10 @@ struct file_and_directory } /* Set the filename. */ - void set_name (const char *name) + void set_name (gdb::unique_xmalloc_ptr<char> name) { - m_name = name; + m_name_storage = std::move (name); + m_name = m_name_storage.get (); } private: @@ -94,6 +95,9 @@ private: /* The filename. */ const char *m_name; + /* Storage for the filename, if needed. */ + gdb::unique_xmalloc_ptr<char> m_name_storage; + /* The compilation directory. NULL if not known. If we needed to compute a new string, it will be stored in the comp_dir_storage member, and this will be NULL. Otherwise, points directly to the diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index ff5758e..f2d7da7 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6986,15 +6986,15 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader, prepare_one_comp_unit (cu, comp_unit_die, pretend_language); /* Allocate a new partial symbol table structure. */ - gdb::unique_xmalloc_ptr<char> debug_filename; static const char artificial[] = "<artificial>"; file_and_directory &fnd = find_file_and_directory (comp_unit_die, cu); if (strcmp (fnd.get_name (), artificial) == 0) { - debug_filename.reset (concat (artificial, "@", - sect_offset_str (per_cu->sect_off), - (char *) NULL)); - fnd.set_name (debug_filename.get ()); + gdb::unique_xmalloc_ptr<char> debug_filename + (concat (artificial, "@", + sect_offset_str (per_cu->sect_off), + (char *) NULL)); + fnd.set_name (std::move (debug_filename)); } pst = create_partial_symtab (per_cu, per_objfile, fnd.get_name ()); |