Don't re-insert disabled breakpoint locations.

llvm-svn: 116908

2 files changed, 6 insertions, 1 deletions

diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp
index fd2296df681..7f8b7dfff3c 100644
--- a/lldb/source/Breakpoint/Breakpoint.cpp
+++ b/lldb/source/Breakpoint/Breakpoint.cpp
@@ -290,6 +290,8 @@ Breakpoint::ModulesChanged (ModuleList &module_list, bool load)
             for (size_t j = 0; j < m_locations.GetSize(); j++)
             {
                 BreakpointLocationSP break_loc = m_locations.GetByIndex(j);
+                if (!break_loc->IsEnabled())
+                    continue;
                 const Section *section = break_loc->GetAddress().GetSection();
                 if (section == NULL || section->GetModule() == module)
                 {
diff --git a/lldb/source/Breakpoint/BreakpointLocationList.cpp b/lldb/source/Breakpoint/BreakpointLocationList.cpp
index a7d5cea30a0..09f94eaee4a 100644
--- a/lldb/source/Breakpoint/BreakpointLocationList.cpp
+++ b/lldb/source/Breakpoint/BreakpointLocationList.cpp
@@ -260,7 +260,10 @@ BreakpointLocationList::ResolveAllBreakpointSites ()
     collection::iterator pos, end = m_locations.end();
 
     for (pos = m_locations.begin(); pos != end; ++pos)
-        (*pos)->ResolveBreakpointSite();
+    {
+        if ((*pos)->IsEnabled())
+            (*pos)->ResolveBreakpointSite();
+    }
 }
 
 uint32_t