summaryrefslogtreecommitdiffstats
path: root/lldb/source/Breakpoint/Breakpoint.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2012-02-24 01:59:29 +0000
committerGreg Clayton <gclayton@apple.com>2012-02-24 01:59:29 +0000
commite72dfb321c5977c65f2d95b8b9d250b69a290b6c (patch)
tree1141c7e9afa82b440290a8b2578501deb85fb096 /lldb/source/Breakpoint/Breakpoint.cpp
parentda970541146d44d426b4306d3692cce19fae9689 (diff)
downloadbcm5719-llvm-e72dfb321c5977c65f2d95b8b9d250b69a290b6c.tar.gz
bcm5719-llvm-e72dfb321c5977c65f2d95b8b9d250b69a290b6c.zip
<rdar://problem/10103468>
I started work on being able to add symbol files after a debug session had started with a new "target symfile add" command and quickly ran into problems with stale Address objects in breakpoint locations that had lldb_private::Section pointers into modules that had been removed or replaced. This also let to grabbing stale modules from those sections. So I needed to thread harded the Address, Section and related objects. To do this I modified the ModuleChild class to now require a ModuleSP on initialization so that a weak reference can created. I also changed all places that were handing out "Section *" to have them hand out SectionSP. All ObjectFile, SymbolFile and SymbolVendors were inheriting from ModuleChild so all of the find plug-in, static creation function and constructors now require ModuleSP references instead of Module *. Address objects now have weak references to their sections which can safely go stale when a module gets destructed. This checkin doesn't complete the "target symfile add" command, but it does get us a lot clioser to being able to do such things without a high risk of crashing or memory corruption. llvm-svn: 151336
Diffstat (limited to 'lldb/source/Breakpoint/Breakpoint.cpp')
-rw-r--r--lldb/source/Breakpoint/Breakpoint.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp
index 5fd8f253034..4d37a7a7edd 100644
--- a/lldb/source/Breakpoint/Breakpoint.cpp
+++ b/lldb/source/Breakpoint/Breakpoint.cpp
@@ -351,8 +351,8 @@ Breakpoint::ModulesChanged (ModuleList &module_list, bool load)
BreakpointLocationSP break_loc = m_locations.GetByIndex(loc_idx);
if (!break_loc->IsEnabled())
continue;
- const Section *section = break_loc->GetAddress().GetSection();
- if (section == NULL || section->GetModule() == module_sp.get())
+ SectionSP section_sp (break_loc->GetAddress().GetSection());
+ if (!section_sp || section_sp->GetModule() == module_sp)
{
if (!seen)
seen = true;
@@ -419,23 +419,25 @@ Breakpoint::ModulesChanged (ModuleList &module_list, bool load)
ModuleSP module_sp (module_list.GetModuleAtIndex (i));
if (m_filter_sp->ModulePasses (module_sp))
{
- const size_t num_locs = m_locations.GetSize();
- for (size_t loc_idx = 0; loc_idx < num_locs; ++loc_idx)
+ size_t loc_idx = 0;
+ while (loc_idx < m_locations.GetSize())
{
- BreakpointLocationSP break_loc = m_locations.GetByIndex(loc_idx);
- const Section *section = break_loc->GetAddress().GetSection();
- if (section && section->GetModule() == module_sp.get())
+ BreakpointLocationSP break_loc_sp (m_locations.GetByIndex(loc_idx));
+ SectionSP section_sp (break_loc_sp->GetAddress().GetSection());
+ if (section_sp && section_sp->GetModule() == module_sp)
{
// Remove this breakpoint since the shared library is
// unloaded, but keep the breakpoint location around
// so we always get complete hit count and breakpoint
// lifetime info
- break_loc->ClearBreakpointSite();
+ break_loc_sp->ClearBreakpointSite();
if (removed_locations_event)
{
- removed_locations_event->GetBreakpointLocationCollection().Add(break_loc);
+ removed_locations_event->GetBreakpointLocationCollection().Add(break_loc_sp);
}
+ //m_locations.RemoveLocation (break_loc_sp);
}
+ ++loc_idx;
}
}
}
OpenPOWER on IntegriCloud