[lldb] [lldb-dap] Return optional values for signed json values.

Author: da-viper

lldb/tools/lldb-dap/DAP.cpp

@@ -526,7 +526,7 @@ ExceptionBreakpoint *DAP::GetExceptionBPFromStopReason(lldb::SBThread &thread) {
 }
 
 lldb::SBThread DAP::GetLLDBThread(const llvm::json::Object &arguments) {
-  auto tid = GetSigned(arguments, "threadId", LLDB_INVALID_THREAD_ID);
+  auto tid = GetSigned(arguments, "threadId").value_or(LLDB_INVALID_THREAD_ID);
   return target.GetProcess().GetThreadByID(tid);
 }
 
@@ -772,7 +772,7 @@ bool DAP::HandleObject(const llvm::json::Object &object) {
   }
 
   if (packet_type == "response") {
-    auto id = GetSigned(object, "request_seq", 0);
+    auto id = GetSigned(object, "request_seq").value_or(0);
 
     std::unique_ptr<ResponseHandler> response_handler;
     {

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

@@ -143,8 +143,9 @@ void CompletionsRequestHandler::operator()(
   }
 
   std::string text = GetString(arguments, "text").str();
-  auto original_column = GetSigned(arguments, "column", text.size());
-  auto original_line = GetSigned(arguments, "line", 1);
+  const auto original_column =
+      GetSigned(arguments, "column").value_or(text.size());
+  const auto original_line = GetSigned(arguments, "line").value_or(1);
   auto offset = original_column - 1;
   if (original_line > 1) {
     llvm::SmallVector<::llvm::StringRef, 2> lines;

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

@@ -104,7 +104,7 @@ void DisassembleRequestHandler::operator()(
   }
   lldb::addr_t addr_ptr = *addr_opt;
 
-  addr_ptr += GetSigned(arguments, "instructionOffset", 0);
+  addr_ptr += GetSigned(arguments, "instructionOffset").value_or(0);
   lldb::SBAddress addr(addr_ptr, dap.target);
   if (!addr.IsValid()) {
     response["success"] = false;

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

@@ -108,7 +108,7 @@ void ReadMemoryRequestHandler::operator()(
     return;
   }
   lldb::addr_t addr_int = *addr_opt;
-  addr_int += GetSigned(arguments, "offset", 0);
+  addr_int += GetSigned(arguments, "offset").value_or(0);
   const uint64_t count_requested = GetUnsigned(arguments, "count").value_or(0);
 
   // We also need support reading 0 bytes

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

@@ -94,8 +94,8 @@ void VariablesRequestHandler::operator()(
   const auto *arguments = request.getObject("arguments");
   const auto variablesReference =
       GetUnsigned(arguments, "variablesReference").value_or(0);
-  const int64_t start = GetSigned(arguments, "start", 0);
-  const int64_t count = GetSigned(arguments, "count", 0);
+  const int64_t start = GetSigned(arguments, "start").value_or(0);
+  const int64_t count = GetSigned(arguments, "count").value_or(0);
   bool hex = false;
   const auto *format = arguments->getObject("format");
   if (format)

lldb/tools/lldb-dap/InstructionBreakpoint.cpp

@@ -20,7 +20,7 @@ namespace lldb_dap {
 InstructionBreakpoint::InstructionBreakpoint(DAP &d,
                                              const llvm::json::Object &obj)
     : Breakpoint(d, obj), instructionAddressReference(LLDB_INVALID_ADDRESS),
-      offset(GetSigned(obj, "offset", 0)) {
+      offset(GetSigned(obj, "offset").value_or(0)) {
   GetString(obj, "instructionReference")
       .getAsInteger(0, instructionAddressReference);
   instructionAddressReference += offset;

lldb/tools/lldb-dap/JSONUtils.cpp

@@ -115,18 +115,17 @@ std::optional<bool> GetBoolean(const llvm::json::Object *obj,
   return std::nullopt;
 }
 
-int64_t GetSigned(const llvm::json::Object &obj, llvm::StringRef key,
-                  int64_t fail_value) {
-  if (auto value = obj.getInteger(key))
-    return *value;
-  return fail_value;
+std::optional<int64_t> GetSigned(const llvm::json::Object &obj,
+                                 llvm::StringRef key) {
+  return obj.getInteger(key);
 }
 
-int64_t GetSigned(const llvm::json::Object *obj, llvm::StringRef key,
-                  int64_t fail_value) {
+std::optional<int64_t> GetSigned(const llvm::json::Object *obj,
+                                 llvm::StringRef key) {
   if (obj == nullptr)
-    return fail_value;
-  return GetSigned(*obj, key, fail_value);
+    return std::nullopt;
+
+  return GetSigned(*obj, key);
 }
 
 bool ObjectContainsKey(const llvm::json::Object &obj, llvm::StringRef key) {
@@ -279,7 +278,7 @@ void FillResponse(const llvm::json::Object &request,
   response.try_emplace("type", "response");
   response.try_emplace("seq", (int64_t)0);
   EmplaceSafeString(response, "command", GetString(request, "command"));
-  const int64_t seq = GetSigned(request, "seq", 0);
+  const int64_t seq = GetSigned(request, "seq").value_or(0);
   response.try_emplace("request_seq", seq);
   response.try_emplace("success", true);
 }

lldb/tools/lldb-dap/JSONUtils.h

@@ -85,7 +85,7 @@ llvm::StringRef GetString(const llvm::json::Object *obj, llvm::StringRef key,
 ///
 /// \return
 ///     The unsigned integer value for the specified \a key, or
-///     std::nullopt if there is no key that matches or if the
+///     \a std::nullopt if there is no key that matches or if the
 ///     value is not an integer.
 std::optional<uint64_t> GetUnsigned(const llvm::json::Object &obj,
                                     llvm::StringRef key);
@@ -102,7 +102,7 @@ std::optional<uint64_t> GetUnsigned(const llvm::json::Object *obj,
 ///     The key to use when extracting the value
 ///
 /// \return
-///     The boolean value for the specified \a key, or std::nullopt
+///     The boolean value for the specified \a key, or \a std::nullopt
 ///     if there is no key that matches or if the value is not a
 ///     boolean value of an integer.
 /// @{
@@ -123,12 +123,12 @@ std::optional<bool> GetBoolean(const llvm::json::Object *obj,
 ///
 /// \return
 ///     The signed integer value for the specified \a key, or
-///     \a fail_value if there is no key that matches or if the
+///     \a std::nullopt if there is no key that matches or if the
 ///     value is not an integer.
-int64_t GetSigned(const llvm::json::Object &obj, llvm::StringRef key,
-                  int64_t fail_value);
-int64_t GetSigned(const llvm::json::Object *obj, llvm::StringRef key,
-                  int64_t fail_value);
+std::optional<int64_t> GetSigned(const llvm::json::Object &obj,
+                                 llvm::StringRef key);
+std::optional<int64_t> GetSigned(const llvm::json::Object *obj,
+                                 llvm::StringRef key);
 
 /// Check if the specified key exists in the specified object.
 ///