Enforce that a "PreferredLineEntry" can't change the location address.

Author: jimingham

lldb/include/lldb/Breakpoint/BreakpointLocation.h

@@ -288,8 +288,15 @@ class BreakpointLocation
   /// It is up to the caller to verify that this is a valid entry to show.
   /// The current use of this is to distinguish among line entries from a
   /// virtual inlined call stack that all share the same address.
-  void SetPreferredLineEntry(const LineEntry &line_entry) {
-    m_preferred_line_entry = line_entry;
+  /// The line entry must have the same start address as the address for this
+  /// location. 
+  bool SetPreferredLineEntry(const LineEntry &line_entry) {
+    if (m_address == line_entry.range.GetBaseAddress()) {
+      m_preferred_line_entry = line_entry;
+      return true;
+    }
+    assert(0 && "Tried to set a preferred line entry with a different address");
+    return false;
   }
 
   const std::optional<LineEntry> GetPreferredLineEntry() {

lldb/source/Breakpoint/BreakpointResolver.cpp

@@ -350,7 +350,11 @@ void BreakpointResolver::AddLocation(SearchFilter &filter,
     // FIXME: The function name will also be wrong here.  Do we need to record
     // that as well, or can we figure that out again when we report this
     // breakpoint location.
-    bp_loc_sp->SetPreferredLineEntry(sc.line_entry);
+    if (!bp_loc_sp->SetPreferredLineEntry(sc.line_entry)) {
+      LLDB_LOG(log, "Tried to add a preferred line entry that didn't have the "
+                    "same address as this location's address.");
+      
+    }
   }
   if (log && bp_loc_sp && !GetBreakpoint()->IsInternal()) {
     StreamString s;