Additional large watchpoint NFC changes for stable/20230725

Author: jasonmolenda

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

@@ -1784,7 +1784,6 @@ ThreadSP ProcessGDBRemote::SetThreadStopInfo(
           // addresses should be provided as \a wp_addr.
           StringExtractor desc_extractor(description.c_str());
           addr_t wp_addr = desc_extractor.GetU64(LLDB_INVALID_ADDRESS);
-          uint32_t wp_index = desc_extractor.GetU32(LLDB_INVALID_INDEX32);
           addr_t wp_hit_addr = desc_extractor.GetU64(LLDB_INVALID_ADDRESS);
           watch_id_t watch_id = LLDB_INVALID_WATCH_ID;
           bool silently_continue = false;
@@ -2243,7 +2242,7 @@ StateType ProcessGDBRemote::SetThreadStopInfo(StringExtractor &stop_packet) {
         // which is parsed in SetThreadStopInfo.
         reason = "watchpoint";
         StreamString ostr;
-        ostr.Printf("%" PRIu64 " %" PRIu32, wp_addr, wp_index);
+        ostr.Printf("%" PRIu64, wp_addr);
         description = std::string(ostr.GetString());
       } else if (key.compare("library") == 0) {
         auto error = LoadModules();

lldb/source/Target/Process.cpp

@@ -745,15 +745,15 @@ static bool
 BreakpointSiteMatchesREPLBreakpoint(const BreakpointSiteSP &bp_site_sp) {
   if (bp_site_sp) {
     size_t owner_idx = 0;
-    BreakpointLocationSP bp_loc_sp = bp_site_sp->GetOwnerAtIndex(owner_idx);
+    BreakpointLocationSP bp_loc_sp = bp_site_sp->GetConstituentAtIndex(owner_idx);
     while (bp_loc_sp) {
       Breakpoint &bp = bp_loc_sp->GetBreakpoint();
       if (bp.IsInternal()) {
         const char *kind = bp.GetBreakpointKind();
         if (kind && strcmp(kind, "REPL") == 0)
           return true;
       }
-      bp_loc_sp = bp_site_sp->GetOwnerAtIndex(++owner_idx);
+      bp_loc_sp = bp_site_sp->GetConstituentAtIndex(++owner_idx);
     }
   }
   return false;

lldb/source/Target/ThreadPlanCallFunction.cpp

@@ -489,7 +489,7 @@ bool ThreadPlanCallFunction::BreakpointsExplainStop() {
   }
   if (m_error_backstop_bp_sp) {
     uint64_t break_site_id = stop_info_sp->GetValue();
-    if (m_process.GetBreakpointSiteList().BreakpointSiteContainsBreakpoint(
+    if (m_process.GetBreakpointSiteList().StopPointSiteContainsBreakpoint(
             break_site_id, m_error_backstop_bp_sp->GetID())) {
       // Our expression threw an uncaught exception.  That will happen in REPL
       // & Playground, though not in

lldb/source/Target/ThreadPlanStepInRange.cpp

@@ -347,7 +347,7 @@ bool ThreadPlanStepInRange::StepInDeepBreakpointExplainsStop(
       // at this site:
       explains_stop = true;
       hit_step_in_deep_bp = true;
-      size_t num_owners = bp_site_sp->GetNumberOfOwners();
+      size_t num_owners = bp_site_sp->GetNumberOfConstituents();
 
       // If all the owners are internal, then we are probably just stepping over
       // this range from multiple threads,
@@ -361,7 +361,7 @@ bool ThreadPlanStepInRange::StepInDeepBreakpointExplainsStop(
         continue;
 
       for (size_t i = 0; i < num_owners; i++) {
-        BreakpointLocationSP owner_loc_sp(bp_site_sp->GetOwnerAtIndex(i));
+        BreakpointLocationSP owner_loc_sp(bp_site_sp->GetConstituentAtIndex(i));
         Breakpoint &owner_bp(owner_loc_sp->GetBreakpoint());
         if (owner_loc_sp->ValidForThisThread(GetThread()) &&
             !owner_bp.IsInternal()) {