Author: jmolenda
Date: Mon Nov  9 22:18:12 2015
New Revision: 252584

URL: http://llvm.org/viewvc/llvm-project?rev=252584&view=rev
Log:
Upstream a small change from Greg Clayton for the REPL support:
"Modify internal breakpoints so they resolve just like external
breakpoints do. This allow you to set symbol and file + line internal
breakpoints and have them get updated correctly."

<rdar://problem/16931767>

Modified:
    lldb/trunk/source/Target/Target.cpp

Modified: lldb/trunk/source/Target/Target.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=252584&r1=252583&r2=252584&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Mon Nov  9 22:18:12 2015
@@ -1371,7 +1371,10 @@ Target::ModuleUpdated (const ModuleList&
 {
     // A module is replacing an already added module
     if (m_valid)
+    {
         m_breakpoint_list.UpdateBreakpointsWhenModuleIsReplaced(old_module_sp, 
new_module_sp);
+        
m_internal_breakpoint_list.UpdateBreakpointsWhenModuleIsReplaced(old_module_sp, 
new_module_sp);
+    }
 }
 
 void
@@ -1380,6 +1383,7 @@ Target::ModulesDidLoad (ModuleList &modu
     if (m_valid && module_list.GetSize())
     {
         m_breakpoint_list.UpdateBreakpoints (module_list, true, false);
+        m_internal_breakpoint_list.UpdateBreakpoints (module_list, true, 
false);
         if (m_process_sp)
         {
             m_process_sp->ModulesDidLoad (module_list);
@@ -1404,6 +1408,7 @@ Target::SymbolsDidLoad (ModuleList &modu
         }
         
         m_breakpoint_list.UpdateBreakpoints (module_list, true, false);
+        m_internal_breakpoint_list.UpdateBreakpoints (module_list, true, 
false);
         BroadcastEvent (eBroadcastBitSymbolsLoaded, new TargetEventData 
(this->shared_from_this(), module_list));
     }
 }
@@ -1415,6 +1420,7 @@ Target::ModulesDidUnload (ModuleList &mo
     {
         UnloadModuleSections (module_list);
         m_breakpoint_list.UpdateBreakpoints (module_list, false, 
delete_locations);
+        m_internal_breakpoint_list.UpdateBreakpoints (module_list, false, 
delete_locations);
         BroadcastEvent (eBroadcastBitModulesUnloaded, new TargetEventData 
(this->shared_from_this(), module_list));
     }
 }


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to