requests serialization

Author: eronnen

lldb/tools/lldb-dap/Handler/RequestHandler.h

@@ -15,7 +15,6 @@
 #include "Protocol/ProtocolBase.h"
 #include "Protocol/ProtocolRequests.h"
 #include "Protocol/ProtocolTypes.h"
-#include "lldb/API/SBError.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"

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

@@ -8,7 +8,6 @@
 
 #include "DAP.h"
 #include "EventHelper.h"
-#include "JSONUtils.h"
 #include "RequestHandler.h"
 
 namespace lldb_dap {

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

@@ -8,7 +8,6 @@
 
 #include "DAP.h"
 #include "EventHelper.h"
-#include "JSONUtils.h"
 #include "RequestHandler.h"
 
 namespace lldb_dap {

lldb/tools/lldb-dap/JSONUtils.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "JSONUtils.h"
-#include "BreakpointBase.h"
 #include "DAP.h"
 #include "ExceptionBreakpoint.h"
 #include "LLDBUtils.h"

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

@@ -301,4 +301,88 @@ bool fromJSON(const llvm::json::Value &Params, StepOutArguments &SOA,
          OM.mapOptional("granularity", SOA.granularity);
 }
 
+bool fromJSON(const llvm::json::Value &Params, SetBreakpointsArguments &SBA,
+              llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("source", SBA.source) &&
+         O.map("breakpoints", SBA.breakpoints) && O.map("lines", SBA.lines) &&
+         O.map("sourceModified", SBA.sourceModified);
+}
+
+llvm::json::Value toJSON(const SetBreakpointsResponseBody &SBR) {
+  json::Object result;
+  result["breakpoints"] = SBR.breakpoints;
+  return result;
+}
+
+bool fromJSON(const llvm::json::Value &Params,
+              SetFunctionBreakpointsArguments &SFBA, llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("breakpoints", SFBA.breakpoints);
+}
+
+llvm::json::Value toJSON(const SetFunctionBreakpointsResponseBody &SFBR) {
+  json::Object result;
+  result["breakpoints"] = SFBR.breakpoints;
+  return result;
+}
+
+bool fromJSON(const llvm::json::Value &Params,
+              SetExceptionBreakpointsArguments &SEBA, llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("filters", SEBA.filters) &&
+         O.map("filterOptions", SEBA.filterOptions) &&
+         O.map("exceptionOptions", SEBA.exceptionOptions);
+}
+
+llvm::json::Value toJSON(const SetExceptionBreakpointsResponseBody &SEBR) {
+  json::Object result;
+  result["breakpoints"] = SEBR.breakpoints;
+  return result;
+}
+
+bool fromJSON(const llvm::json::Value &Params,
+              SetInstructionBreakpointsArguments &SIBA, llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("breakpoints", SIBA.breakpoints);
+}
+
+llvm::json::Value toJSON(const SetInstructionBreakpointsResponseBody &SIBR) {
+  json::Object result;
+  result["breakpoints"] = SIBR.breakpoints;
+  return result;
+}
+
+bool fromJSON(const llvm::json::Value &Params,
+              DataBreakpointInfoArguments &DBIA, llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("variablesReference", DBIA.variablesReference) &&
+         O.map("name", DBIA.name) && O.map("frameId", DBIA.frameId) &&
+         O.map("bytes", DBIA.bytes) && O.map("asAddress", DBIA.asAddress) &&
+         O.map("mode", DBIA.mode);
+}
+
+llvm::json::Value toJSON(const DataBreakpointInfoResponseBody &DBIRB) {
+  json::Object result;
+  result["dataId"] = DBIRB.dataId ? *DBIRB.dataId : llvm::json::Value(nullptr);
+  result["description"] = DBIRB.description;
+  if (DBIRB.accessTypes)
+    result["accessTypes"] = *DBIRB.accessTypes;
+  if (DBIRB.canPersist)
+    result["canPersist"] = *DBIRB.canPersist;
+  return result;
+}
+
+bool fromJSON(const llvm::json::Value &Params,
+              SetDataBreakpointsArguments &SDBA, llvm::json::Path P) {
+  json::ObjectMapper O(Params, P);
+  return O && O.map("breakpoints", SDBA.breakpoints);
+}
+
+llvm::json::Value toJSON(const SetDataBreakpointsResponseBody &SDBR) {
+  json::Object result;
+  result["breakpoints"] = SDBR.breakpoints;
+  return result;
+}
+
 } // namespace lldb_dap::protocol

lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp

@@ -393,6 +393,18 @@ bool fromJSON(const llvm::json::Value &Params, DataBreakpointAccessType &DBAT,
   return true;
 }
 
+llvm::json::Value toJSON(const DataBreakpointAccessType &DBAT) {
+  switch (DBAT) {
+  case eDataBreakpointAccessTypeRead:
+    return "read";
+  case eDataBreakpointAccessTypeWrite:
+    return "write";
+  case eDataBreakpointAccessTypeReadWrite:
+    return "readWrite";
+  }
+  llvm_unreachable("unhandled data breakpoint access type.");
+}
+
 bool fromJSON(const llvm::json::Value &Params, DataBreakpointInfo &DBI,
               llvm::json::Path P) {
   json::ObjectMapper O(Params, P);

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

@@ -273,7 +273,6 @@ enum PresentationHint : unsigned {
   ePresentationHintEmphasize,
   ePresentationHintDeemphasize,
 };
-llvm::json::Value toJSON(const PresentationHint &);
 
 /// A `Source` is a descriptor for source code. It is returned from the debug
 /// adapter as part of a `StackFrame` and it is used by clients when specifying
@@ -453,6 +452,7 @@ enum DataBreakpointAccessType : unsigned {
 };
 bool fromJSON(const llvm::json::Value &, DataBreakpointAccessType &,
               llvm::json::Path);
+llvm::json::Value toJSON(const DataBreakpointAccessType &);
 
 /// Properties of a data breakpoint passed to the `setDataBreakpoints` request.
 struct DataBreakpointInfo {

lldb/tools/lldb-dap/Watchpoint.cpp

@@ -46,6 +46,8 @@ protocol::Breakpoint Watchpoint::ToProtocolBreakpoint() {
   } else {
     breakpoint.verified = true;
   }
+
+  return breakpoint;
 }
 
 void Watchpoint::SetWatchpoint() {