data breakpoint

Author: eronnen

lldb/tools/lldb-dap/Breakpoint.h

@@ -26,7 +26,6 @@ class Breakpoint : public BreakpointBase {
 
   void SetCondition() override;
   void SetHitCondition() override;
-
   protocol::Breakpoint ToProtocolBreakpoint() override;
 
   bool MatchesName(const char *name);

lldb/tools/lldb-dap/DAP.cpp

@@ -525,8 +525,9 @@ lldb::SBFrame DAP::GetLLDBFrame(uint64_t frame_id) {
 }
 
 lldb::SBFrame DAP::GetLLDBFrame(const llvm::json::Object &arguments) {
-  const auto frame_id = GetInteger<uint64_t>(arguments, "frameId");
-  return GetLLDBFrame(frame_id.value_or(0));
+  const auto frame_id =
+      GetInteger<uint64_t>(arguments, "frameId").value_or(UINT64_MAX);
+  return GetLLDBFrame(frame_id);
 }
 
 llvm::json::Value DAP::CreateTopLevelScopes() {

lldb/tools/lldb-dap/Handler/DataBreakpointInfoRequestHandler.cpp

@@ -23,20 +23,21 @@ llvm::Expected<protocol::DataBreakpointInfoResponseBody>
 DataBreakpointInfoRequestHandler::Run(
     const protocol::DataBreakpointInfoArguments &args) const {
   protocol::DataBreakpointInfoResponseBody response;
-  lldb::SBFrame frame = dap.GetLLDBFrame(args.frameId.value_or(0));
+  lldb::SBFrame frame = dap.GetLLDBFrame(args.frameId.value_or(UINT64_MAX));
   lldb::SBValue variable = dap.variables.FindVariable(
       args.variablesReference.value_or(0), args.name);
   std::string addr, size;
 
+  bool is_data_ok = true;
   if (variable.IsValid()) {
     lldb::addr_t load_addr = variable.GetLoadAddress();
     size_t byte_size = variable.GetByteSize();
     if (load_addr == LLDB_INVALID_ADDRESS) {
-      response.dataId = std::nullopt;
+      is_data_ok = false;
       response.description = "does not exist in memory, its location is " +
                              std::string(variable.GetLocation());
     } else if (byte_size == 0) {
-      response.dataId = std::nullopt;
+      is_data_ok = false;
       response.description = "variable size is 0";
     } else {
       addr = llvm::utohexstr(load_addr);
@@ -47,7 +48,7 @@ DataBreakpointInfoRequestHandler::Run(
     if (value.GetError().Fail()) {
       lldb::SBError error = value.GetError();
       const char *error_cstr = error.GetCString();
-      response.dataId = std::nullopt;
+      is_data_ok = false;
       response.description = error_cstr && error_cstr[0]
                                  ? std::string(error_cstr)
                                  : "evaluation failed";
@@ -64,23 +65,23 @@ DataBreakpointInfoRequestHandler::Run(
         // request if SBProcess::GetMemoryRegionInfo returns error.
         if (err.Success()) {
           if (!(region.IsReadable() || region.IsWritable())) {
-            response.dataId = std::nullopt;
+            is_data_ok = false;
             response.description = "memory region for address " + addr +
                                    " has no read or write permissions";
           }
         }
       } else {
-        response.dataId = std::nullopt;
+        is_data_ok = false;
         response.description =
             "unable to get byte size for expression: " + args.name;
       }
     }
   } else {
-    response.dataId = std::nullopt;
+    is_data_ok = false;
     response.description = "variable not found: " + args.name;
   }
 
-  if (!response.dataId.has_value()) {
+  if (is_data_ok) {
     response.dataId = addr + "/" + size;
     response.accessTypes = {protocol::eDataBreakpointAccessTypeRead,
                             protocol::eDataBreakpointAccessTypeWrite,

lldb/tools/lldb-dap/Protocol/ProtocolRequests.h

@@ -517,7 +517,7 @@ struct DataBreakpointInfoResponseBody {
   /// for details. Breakpoints set using the `dataId` in the
   /// `setDataBreakpoints` request may outlive the lifetime of the associated
   /// `dataId`.
-  std::optional<std::optional<std::string>> dataId;
+  std::optional<std::string> dataId;
 
   /// UI string that describes on what data the breakpoint is set on or why a
   /// data breakpoint is not available.

llvm/include/llvm/Support/JSON.h

@@ -781,7 +781,7 @@ inline bool fromJSON(const Value &E, unsigned int &Out, Path P) {
     Out = *S;
     return true;
   }
-  P.report("expected integer");
+  P.report("expected unsigned integer");
   return false;
 }
 inline bool fromJSON(const Value &E, uint64_t &Out, Path P) {