Make breakpoint stop reason more accurate

Author: satyajanga

lldb/tools/lldb-dap/DAP.cpp

@@ -1014,34 +1014,6 @@ void DAP::SetThreadFormat(llvm::StringRef format) {
   }
 }
 
-InstructionBreakpoint *
-DAP::GetInstructionBreakpoint(const lldb::break_id_t bp_id) {
-  for (auto &bp : instruction_breakpoints) {
-    if (bp.second.bp.GetID() == bp_id)
-      return &bp.second;
-  }
-  return nullptr;
-}
-
-InstructionBreakpoint *
-DAP::GetInstructionBPFromStopReason(lldb::SBThread &thread) {
-  const auto num = thread.GetStopReasonDataCount();
-  InstructionBreakpoint *inst_bp = nullptr;
-  for (size_t i = 0; i < num; i += 2) {
-    // thread.GetStopReasonDataAtIndex(i) will return the bp ID and
-    // thread.GetStopReasonDataAtIndex(i+1) will return the location
-    // within that breakpoint. We only care about the bp ID so we can
-    // see if this is an instruction breakpoint that is getting hit.
-    lldb::break_id_t bp_id = thread.GetStopReasonDataAtIndex(i);
-    inst_bp = GetInstructionBreakpoint(bp_id);
-    // If any breakpoint is not an instruction breakpoint, then stop and
-    // report this as a normal breakpoint
-    if (inst_bp == nullptr)
-      return nullptr;
-  }
-  return inst_bp;
-}
-
 lldb::SBValueList *Variables::GetTopLevelScope(int64_t variablesReference) {
   switch (variablesReference) {
   case VARREF_LOCALS:

lldb/tools/lldb-dap/DAP.h

@@ -233,7 +233,6 @@ struct DAP {
   /// @}
 
   ExceptionBreakpoint *GetExceptionBreakpoint(const std::string &filter);
-  ExceptionBreakpoint *GetExceptionBreakpoint(const lldb::break_id_t bp_id);
 
   /// Redirect stdout and stderr fo the IDE's console output.
   ///
@@ -445,18 +444,6 @@ struct DAP {
     }
     return nullptr;
   }
-
-  FunctionBreakpoint *GetFunctionBPFromStopReason(lldb::SBThread &thread);
-
-  FunctionBreakpoint *GetFunctionBreakPoint(const lldb::break_id_t bp_id);
-
-  void WaitWorkerThreadsToExit();
-
-private:
-  // Send the JSON in "json_str" to the "out" stream. Correctly send the
-  // "Content-Length:" field followed by the length, followed by the raw
-  // JSON bytes.
-  void SendJSON(const std::string &json_str);
 };
 
 } // namespace lldb_dap