Address code style comments

Author: vogelsgesang

lldb/tools/lldb-dap/JSONUtils.cpp

@@ -690,8 +690,7 @@ std::optional<llvm::json::Value> CreateSource(lldb::SBFrame &frame) {
 //     "instructionPointerReference": {
 // 	     "type": "string",
 // 	     "description": "A memory reference for the current instruction
-// pointer
-//                       in this frame."
+//                         pointer in this frame."
 //     },
 //     "moduleId": {
 //       "type": ["integer", "string"],
@@ -1180,17 +1179,15 @@ std::string VariableDescription::GetResult(llvm::StringRef context) {
   return description.trim().str();
 }
 
-lldb::addr_t GetMemoryReference(lldb::SBValue v) {
-  if (!v.GetType().IsPointerType() && !v.GetType().IsArrayType()) {
-    return LLDB_INVALID_ADDRESS;
-  }
+std::optional<lldb::addr_t> GetMemoryReference(lldb::SBValue v) {
+  if (!v.GetType().IsPointerType() && !v.GetType().IsArrayType())
+    return std::nullopt;
 
   lldb::SBValue deref = v.Dereference();
-  if (!deref.IsValid()) {
-    return LLDB_INVALID_ADDRESS;
-  }
-
-  return deref.GetLoadAddress();
+  lldb::addr_t load_addr = deref.GetLoadAddress();
+  if (load_addr != LLDB_INVALID_ADDRESS)
+    return load_addr;
+  return std::nullopt;
 }
 
 // "Variable": {
@@ -1369,9 +1366,8 @@ llvm::json::Value CreateVariable(lldb::SBValue v, int64_t variablesReference,
   else
     object.try_emplace("variablesReference", (int64_t)0);
 
-  if (lldb::addr_t addr = GetMemoryReference(v); addr != LLDB_INVALID_ADDRESS) {
-    object.try_emplace("memoryReference", "0x" + llvm::utohexstr(addr));
-  }
+  if (std::optional<lldb::addr_t> addr = GetMemoryReference(v))
+    object.try_emplace("memoryReference", "0x" + llvm::utohexstr(*addr));
 
   object.try_emplace("$__lldb_extensions", desc.GetVariableExtensionsJSON());
   return llvm::json::Value(std::move(object));

lldb/tools/lldb-dap/JSONUtils.h

@@ -445,7 +445,7 @@ struct VariableDescription {
 ///
 /// According to the DAP documentation, the `memoryReference` should
 /// refer to the pointee, not to the address of the pointer itself.
-lldb::addr_t GetMemoryReference(lldb::SBValue v);
+std::optional<lldb::addr_t> GetMemoryReference(lldb::SBValue v);
 
 /// Create a "Variable" object for a LLDB thread object.
 ///

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -1617,10 +1617,8 @@ void request_evaluate(const llvm::json::Object &request) {
       } else {
         body.try_emplace("variablesReference", (int64_t)0);
       }
-      if (lldb::addr_t addr = GetMemoryReference(value);
-          addr != LLDB_INVALID_ADDRESS) {
-        body.try_emplace("memoryReference", "0x" + llvm::utohexstr(addr));
-      }
+      if (std::optional<lldb::addr_t> addr = GetMemoryReference(value))
+        body.try_emplace("memoryReference", "0x" + llvm::utohexstr(*addr));
     }
   }
   response.try_emplace("body", std::move(body));
@@ -3794,10 +3792,8 @@ void request_setVariable(const llvm::json::Object &request) {
             variable, /*is_permanent=*/false);
       body.try_emplace("variablesReference", newVariablesReference);
 
-      if (lldb::addr_t addr = GetMemoryReference(variable);
-          addr != LLDB_INVALID_ADDRESS) {
-        body.try_emplace("memoryReference", "0x" + llvm::utohexstr(addr));
-      }
+      if (std::optional<lldb::addr_t> addr = GetMemoryReference(variable))
+        body.try_emplace("memoryReference", "0x" + llvm::utohexstr(*addr));
     } else {
       EmplaceSafeString(body, "message", std::string(error.GetCString()));
     }
@@ -4324,7 +4320,7 @@ void request_readMemory(const llvm::json::Object &request) {
   }
 
   addr += GetSigned(arguments, "offset", 0);
-  const auto requested_count = GetUnsigned(arguments, "count", 0);
+  const uint64_t requested_count = GetUnsigned(arguments, "count", 0);
   lldb::SBMemoryRegionInfo region_info;
   lldb::SBError memRegError = process.GetMemoryRegionInfo(addr, region_info);
   if (memRegError.Fail()) {
@@ -4335,15 +4331,15 @@ void request_readMemory(const llvm::json::Object &request) {
     g_dap.SendJSON(llvm::json::Value(std::move(response)));
     return;
   }
-  const auto available_count =
+  const uint64_t available_count =
       std::min(requested_count, region_info.GetRegionEnd() - addr);
-  const auto unavailable_count = requested_count - available_count;
+  const uint64_t unavailable_count = requested_count - available_count;
 
   std::vector<uint8_t> buf;
   buf.resize(available_count);
   if (available_count > 0) {
     lldb::SBError memReadError;
-    auto bytes_read =
+    uint64_t bytes_read =
         process.ReadMemory(addr, buf.data(), available_count, memReadError);
     if (memReadError.Fail()) {
       response["success"] = false;