Fix review comments

Author: DrSergei

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py

@@ -1239,19 +1239,13 @@ def request_dataBreakpointInfo(
         stackFrame = self.get_stackFrame(frameIndex=frameIndex, threadId=threadId)
         if stackFrame is None:
             return []
-        args_dict = (
-            {
-                "variablesReference": variablesReference,
-                "name": name,
-                "frameId": stackFrame["id"],
-            }
-            if size is None
-            else {
-                "bytes": size,
-                "name": name,
-                "asAddress": True,
-            }
-        )
+        args_dict = {"name": name}
+        if size is None:
+            args_dict["variablesReference"] = variablesReference
+            args_dict["frameId"] = stackFrame["id"]
+        else:
+            args_dict["asAddress"] = True
+            args_dict["bytes"] = size
         command_dict = {
             "command": "dataBreakpointInfo",
             "type": "request",

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

@@ -16,7 +16,7 @@
 
 namespace lldb_dap {
 
-static bool CheckAddress(DAP &dap, lldb::addr_t load_addr) {
+static bool IsRW(DAP &dap, lldb::addr_t load_addr) {
   lldb::SBMemoryRegionInfo region;
   lldb::SBError err =
       dap.target.GetProcess().GetMemoryRegionInfo(load_addr, region);
@@ -72,7 +72,7 @@ DataBreakpointInfoRequestHandler::Run(
       if (data.IsValid()) {
         size = llvm::utostr(data.GetByteSize());
         addr = llvm::utohexstr(load_addr);
-        if (!CheckAddress(dap, load_addr)) {
+        if (!IsRW(dap, load_addr)) {
           is_data_ok = false;
           response.description = "memory region for address " + addr +
                                  " has no read or write permissions";
@@ -89,7 +89,7 @@ DataBreakpointInfoRequestHandler::Run(
       addr = args.name.substr(2);
     else
       addr = llvm::utohexstr(std::stoull(args.name));
-    if (!CheckAddress(dap, std::stoull(addr, 0, 16))) {
+    if (!IsRW(dap, std::stoull(addr, 0, 16))) {
       is_data_ok = false;
       response.description = "memory region for address " + addr +
                              " has no read or write permissions";