1 files changed, 73 insertions, 17 deletions

diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverAddress.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
index 193bc41..8a0469a 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
@@ -16,6 +16,7 @@
 
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Core/Log.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
@@ -29,10 +30,25 @@ using namespace lldb_private;
 BreakpointResolverAddress::BreakpointResolverAddress
 (
     Breakpoint *bkpt,
+    const Address &addr,
+    const FileSpec &module_spec
+) :
+    BreakpointResolver (bkpt, BreakpointResolver::AddressResolver),
+    m_addr (addr),
+    m_resolved_addr(LLDB_INVALID_ADDRESS),
+    m_module_filespec(module_spec)
+{
+}
+
+BreakpointResolverAddress::BreakpointResolverAddress
+(
+    Breakpoint *bkpt,
     const Address &addr
 ) :
     BreakpointResolver (bkpt, BreakpointResolver::AddressResolver),
-    m_addr (addr)
+    m_addr (addr),
+    m_resolved_addr(LLDB_INVALID_ADDRESS),
+    m_module_filespec()
 {
 }
 
@@ -44,10 +60,16 @@ BreakpointResolverAddress::~BreakpointResolverAddress ()
 void
 BreakpointResolverAddress::ResolveBreakpoint (SearchFilter &filter)
 {
-    // The address breakpoint only takes once, so if we've already set it we're done.
-    if (m_breakpoint->GetNumLocations() > 0)
-        return;
-    else
+    // If the address is not section relative, then we should not try to re-resolve it, it is just some
+    // random address and we wouldn't know what to do on reload.  But if it is section relative, we need to
+    // re-resolve it since the section it's in may have shifted on re-run.
+    bool re_resolve = false;
+    if (m_addr.GetSection() || m_module_filespec)
+        re_resolve = true;
+    else if (m_breakpoint->GetNumLocations() == 0)
+        re_resolve = true;
+    
+    if (re_resolve)
         BreakpointResolver::ResolveBreakpoint(filter);
 }
 
@@ -58,10 +80,14 @@ BreakpointResolverAddress::ResolveBreakpointInModules
     ModuleList &modules
 )
 {
-    // The address breakpoint only takes once, so if we've already set it we're done.
-    if (m_breakpoint->GetNumLocations() > 0)
-        return;
-    else
+    // See comment in ResolveBreakpoint.
+    bool re_resolve = false;
+    if (m_addr.GetSection())
+        re_resolve = true;
+    else if (m_breakpoint->GetNumLocations() == 0)
+        re_resolve = true;
+    
+    if (re_resolve)
         BreakpointResolver::ResolveBreakpointInModules (filter, modules);
 }
 
@@ -78,14 +104,44 @@ BreakpointResolverAddress::SearchCallback
 
     if (filter.AddressPasses (m_addr))
     {
-        BreakpointLocationSP bp_loc_sp(m_breakpoint->AddLocation(m_addr));
-        if (bp_loc_sp && !m_breakpoint->IsInternal())
+        if (m_breakpoint->GetNumLocations() == 0)
+        {
+            // If the address is just an offset, and we're given a module, see if we can find the appropriate module
+            // loaded in the binary, and fix up m_addr to use that.
+            if (!m_addr.IsSectionOffset() && m_module_filespec)
+            {
+                Target &target = m_breakpoint->GetTarget();
+                ModuleSpec module_spec(m_module_filespec);
+                ModuleSP module_sp = target.GetImages().FindFirstModule(module_spec);
+                if (module_sp)
+                {
+                    Address tmp_address;
+                    if (module_sp->ResolveFileAddress(m_addr.GetOffset(), tmp_address))
+                        m_addr = tmp_address;
+                }
+            }
+            
+            BreakpointLocationSP bp_loc_sp(m_breakpoint->AddLocation(m_addr));
+            m_resolved_addr = m_addr.GetLoadAddress(&m_breakpoint->GetTarget());
+            if (bp_loc_sp && !m_breakpoint->IsInternal())
+            {
+                    StreamString s;
+                    bp_loc_sp->GetDescription(&s, lldb::eDescriptionLevelVerbose);
+                    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS));
+                    if (log)
+                        log->Printf ("Added location: %s\n", s.GetData());
+            }
+        }
+        else
         {
-            StreamString s;
-            bp_loc_sp->GetDescription(&s, lldb::eDescriptionLevelVerbose);
-            Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS));
-            if (log)
-                log->Printf ("Added location: %s\n", s.GetData());
+            BreakpointLocationSP loc_sp = m_breakpoint->GetLocationAtIndex(0);
+            lldb::addr_t cur_load_location = m_addr.GetLoadAddress(&m_breakpoint->GetTarget());
+            if (cur_load_location != m_resolved_addr)
+            {
+                m_resolved_addr = cur_load_location;
+                loc_sp->ClearBreakpointSite();
+                loc_sp->ResolveBreakpointSite();
+            }
         }
     }
     return Searcher::eCallbackReturnStop;
@@ -101,7 +157,7 @@ void
 BreakpointResolverAddress::GetDescription (Stream *s)
 {
     s->PutCString ("address = ");
-    m_addr.Dump(s, m_breakpoint->GetTarget().GetProcessSP().get(), Address::DumpStyleLoadAddress, Address::DumpStyleModuleWithFileAddress);
+    m_addr.Dump(s, m_breakpoint->GetTarget().GetProcessSP().get(), Address::DumpStyleModuleWithFileAddress, Address::DumpStyleLoadAddress);
 }
 
 void