mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-27 04:52:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change allocation of m_dwarf2_cus

Browse Source 
m_dwarf2_cus manually manages the 'dwarf2_cu' pointers it owns.  This
patch simplifies the code by changing it to use unique_ptr.
This commit is contained in:
Tom Tromey 2022-06-07 18:00:59 -06:00
parent 2c3b9a9130
commit d09ee622ee
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/dwarf2/read.c
View File

@ -1476,9 +1476,6 @@ dwarf2_per_objfile::remove_all_cus ()
{
gdb_assert (!this->per_bfd->queue.has_value ());
for (auto pair : m_dwarf2_cus)
delete pair.second;
m_dwarf2_cus.clear ();
}
@ -6350,7 +6347,7 @@ cutu_reader::keep ()
/* Save this dwarf2_cu in the per_objfile. The per_objfile owns it
now. */
dwarf2_per_objfile *per_objfile = m_new_cu->per_objfile;
per_objfile->set_cu (m_this_cu, m_new_cu.release ());
per_objfile->set_cu (m_this_cu, std::move (m_new_cu));
}
}
@ -23535,17 +23532,18 @@ dwarf2_per_objfile::get_cu (dwarf2_per_cu_data *per_cu)
if (it == m_dwarf2_cus.end ())
return nullptr;
return it->second;
return it->second.get ();
}
/* See read.h. */
void
dwarf2_per_objfile::set_cu (dwarf2_per_cu_data *per_cu, dwarf2_cu *cu)
dwarf2_per_objfile::set_cu (dwarf2_per_cu_data *per_cu,
std::unique_ptr<dwarf2_cu> cu)
{
gdb_assert (this->get_cu (per_cu) == nullptr);
m_dwarf2_cus[per_cu] = cu;
m_dwarf2_cus[per_cu] = std::move (cu);
}
/* See read.h. */
@ -23563,14 +23561,14 @@ dwarf2_per_objfile::age_comp_units ()
gdb_assert (!this->per_bfd->queue.has_value ());
/* Start by clearing all marks. */
for (auto pair : m_dwarf2_cus)
for (const auto &pair : m_dwarf2_cus)
pair.second->clear_mark ();
/* Traverse all CUs, mark them and their dependencies if used recently
enough. */
for (auto pair : m_dwarf2_cus)
for (const auto &pair : m_dwarf2_cus)
{
dwarf2_cu *cu = pair.second;
dwarf2_cu *cu = pair.second.get ();
cu->last_used++;
if (cu->last_used <= dwarf_max_cache_age)
@ -23580,13 +23578,12 @@ dwarf2_per_objfile::age_comp_units ()
/* Delete all CUs still not marked. */
for (auto it = m_dwarf2_cus.begin (); it != m_dwarf2_cus.end ();)
{
dwarf2_cu *cu = it->second;
dwarf2_cu *cu = it->second.get ();
if (!cu->is_marked ())
{
dwarf_read_debug_printf_v ("deleting old CU %s",
sect_offset_str (cu->per_cu->sect_off));
delete cu;
it = m_dwarf2_cus.erase (it);
}
else
@ -23603,8 +23600,6 @@ dwarf2_per_objfile::remove_cu (dwarf2_per_cu_data *per_cu)
if (it == m_dwarf2_cus.end ())
return;
delete it->second;
m_dwarf2_cus.erase (it);
}

6
gdb/dwarf2/read.h
View File

@ -28,6 +28,7 @@
#include "dwarf2/index-cache.h"
#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"
@ -547,7 +548,7 @@ struct dwarf2_per_objfile
dwarf2_cu *get_cu (dwarf2_per_cu_data *per_cu);
/* Set the dwarf2_cu matching PER_CU for this objfile. */
void set_cu (dwarf2_per_cu_data *per_cu, dwarf2_cu *cu);
void set_cu (dwarf2_per_cu_data *per_cu, std::unique_ptr<dwarf2_cu> cu);
/* Remove/free the dwarf2_cu matching PER_CU for this objfile. */
void remove_cu (dwarf2_per_cu_data *per_cu);
@ -596,7 +597,8 @@ struct dwarf2_per_objfile
/* Map from the objfile-independent dwarf2_per_cu_data instances to the
corresponding objfile-dependent dwarf2_cu instances. */
std::unordered_map<dwarf2_per_cu_data *, dwarf2_cu *> m_dwarf2_cus;
std::unordered_map<dwarf2_per_cu_data *,
std::unique_ptr<dwarf2_cu>> m_dwarf2_cus;
};
/* Get the dwarf2_per_objfile associated to OBJFILE. */