Address comments (2)

Author: vogelsgesang

lldb/test/API/tools/lldb-dap/locations/main.cpp

@@ -6,6 +6,5 @@ int main(void) {
   int var1 = 1;
   void (*func_ptr)() = &greet;
   void (&func_ref)() = greet;
-  __builtin_printf("break here");
-  return 0;
+  return 0; // break here
 }

lldb/tools/lldb-dap/JSONUtils.cpp

@@ -1198,10 +1198,9 @@ std::string VariableDescription::GetResult(llvm::StringRef context) {
   return description.trim().str();
 }
 
-bool HasValueLocation(lldb::SBValue v) {
-  if (!v.GetType().IsPointerType() && !v.GetType().IsReferenceType()) {
+bool ValuePointsToCode(lldb::SBValue v) {
+  if (!v.GetType().GetPointeeType().IsFunctionType())
     return false;
-  }
 
   lldb::addr_t addr = v.GetValueAsAddress();
   lldb::SBLineEntry line_entry =
@@ -1424,7 +1423,7 @@ llvm::json::Value CreateVariable(lldb::SBValue v, int64_t var_ref,
   if (v.GetDeclaration().IsValid())
     object.try_emplace("declarationLocationReference", PackLocation(var_ref, false));
 
-  if (HasValueLocation(v))
+  if (ValuePointsToCode(v))
     object.try_emplace("valueLocationReference", PackLocation(var_ref, true));
 
   if (lldb::addr_t addr = v.GetLoadAddress(); addr != LLDB_INVALID_ADDRESS)

lldb/tools/lldb-dap/JSONUtils.h

@@ -459,7 +459,7 @@ struct VariableDescription {
 };
 
 /// Does the given variable have an associated value location?
-bool HasValueLocation(lldb::SBValue v);
+bool ValuePointsToCode(lldb::SBValue v);
 
 /// Pack a location into a single integer which we can send via
 /// the debug adapter protocol.

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

@@ -1642,7 +1642,7 @@ void request_evaluate(const llvm::json::Object &request) {
       EmplaceSafeString(body, "result", desc.GetResult(context));
       EmplaceSafeString(body, "type", desc.display_type_name);
       int64_t var_ref = 0;
-      if (value.MightHaveChildren() || HasValueLocation(value))
+      if (value.MightHaveChildren() || ValuePointsToCode(value))
          var_ref = g_dap.variables.InsertVariable(
           value, /*is_permanent=*/context == "repl");
       if (value.MightHaveChildren())
@@ -1652,7 +1652,7 @@ void request_evaluate(const llvm::json::Object &request) {
       if (lldb::addr_t addr = value.GetLoadAddress();
           addr != LLDB_INVALID_ADDRESS)
         body.try_emplace("memoryReference", EncodeMemoryReference(addr));
-      if (HasValueLocation(value))
+      if (ValuePointsToCode(value))
         body.try_emplace("valueLocationReference", var_ref);
     }
   }
@@ -3841,7 +3841,7 @@ void request_setVariable(const llvm::json::Object &request) {
       if (lldb::addr_t addr = variable.GetLoadAddress();
           addr != LLDB_INVALID_ADDRESS)
         body.try_emplace("memoryReference", EncodeMemoryReference(addr));
-      if (HasValueLocation(variable))
+      if (ValuePointsToCode(variable))
         body.try_emplace("valueLocationReference", new_var_ref);
     } else {
       EmplaceSafeString(body, "message", std::string(error.GetCString()));