[lldb-dap] Fix: only show return values in the local scope.

Author: da-viper

lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py

@@ -688,7 +688,6 @@ def test_return_variables(self):
         threads = self.dap_server.get_threads()
         for thread in threads:
             if thread.get("reason") == "breakpoint":
-                # We have a thread that
                 thread_id = thread["id"]
 
                 self.stepOut(threadId=thread_id)

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

@@ -4192,7 +4192,7 @@ void request_variables(DAP &dap, const llvm::json::Object &request) {
     if (num_children == 0 && variablesReference == VARREF_LOCALS) {
       // Check for an error in the SBValueList that might explain why we don't
       // have locals. If we have an error display it as the sole value in the
-      // the locals.
+      // locals.
 
       // "error" owns the error string so we must keep it alive as long as we
       // want to use the returns "const char *"
@@ -4225,21 +4225,23 @@ void request_variables(DAP &dap, const llvm::json::Object &request) {
       variable_name_counts[GetNonNullVariableName(variable)]++;
     }
 
-    // Show return value if there is any ( in the top frame )
-    auto process = g_dap.target.GetProcess();
-    auto selected_thread = process.GetSelectedThread();
-    lldb::SBValue stop_return_value = selected_thread.GetStopReturnValue();
-    if (stop_return_value.IsValid() &&
-        (selected_thread.GetSelectedFrame().GetFrameID() == 0)) {
-      auto renamed_return_value = stop_return_value.Clone("(Return Value)");
-      int64_t return_var_ref = 0;
-      if (stop_return_value.MightHaveChildren() ||
-          stop_return_value.IsSynthetic()) {
-        return_var_ref = g_dap.variables.InsertExpandableVariable(
-            stop_return_value, /*is_permanent=*/false);
+    // Show return value if there is any ( in the local top frame )
+    if (variablesReference == VARREF_LOCALS) {
+      auto process = g_dap.target.GetProcess();
+      auto selected_thread = process.GetSelectedThread();
+      lldb::SBValue stop_return_value = selected_thread.GetStopReturnValue();
+      if (stop_return_value.IsValid() &&
+          (selected_thread.GetSelectedFrame().GetFrameID() == 0)) {
+        auto renamed_return_value = stop_return_value.Clone("(Return Value)");
+        int64_t return_var_ref = 0;
+        if (stop_return_value.MightHaveChildren() ||
+            stop_return_value.IsSynthetic()) {
+          return_var_ref = g_dap.variables.InsertExpandableVariable(
+              stop_return_value, /*is_permanent=*/false);
+        }
+        variables.emplace_back(CreateVariable(
+            renamed_return_value, return_var_ref, UINT64_MAX, hex, false));
       }
-      variables.emplace_back(CreateVariable(renamed_return_value, return_var_ref,
-                                            UINT64_MAX, hex, false));
     }
 
     // Now we construct the result with unique display variable names