[lldb-dap] Refactoring IO handling for the SBDebugger.

lldb/include/lldb/Utility/LLDBLog.h

@@ -57,6 +57,7 @@ enum class LLDBLog : Log::MaskType {
 LLVM_ENABLE_BITMASK_ENUMS_IN_NAMESPACE();
 
 void InitializeLldbChannel();
+void TerminateLldbChannel();
 
 template <> Log::Channel &LogChannelFor<LLDBLog>();
 } // namespace lldb_private

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

@@ -995,15 +995,15 @@ def request_writeMemory(self, memoryReference, data, offset=0, allowPartial=Fals
 
     def request_evaluate(
         self,
-        expression,
+        expression: str,
         frameIndex=0,
-        threadId=None,
-        context=None,
+        threadId: Optional[int] = None,
+        context: Optional[
+            Literal["watch", "repl", "hover", "clipboard", "variables"]
+        ] = None,
         is_hex: Optional[bool] = None,
-    ):
+    ) -> Optional[Response]:
         stackFrame = self.get_stackFrame(frameIndex=frameIndex, threadId=threadId)
-        if stackFrame is None:
-            return []
         args_dict = {
             "expression": expression,
             "frameId": stackFrame["id"],
@@ -1012,7 +1012,7 @@ def request_evaluate(
             args_dict["context"] = context
         if is_hex is not None:
             args_dict["format"] = {"hex": is_hex}
-        command_dict = {
+        command_dict: Request = {
             "command": "evaluate",
             "type": "request",
             "arguments": args_dict,

lldb/source/Core/Debugger.cpp

@@ -743,6 +743,11 @@ void Debugger::Terminate() {
         debugger->Clear();
       g_debugger_list_ptr->clear();
     }
+
+    delete g_debugger_list_ptr;
+    delete g_debugger_list_mutex_ptr;
+    g_debugger_list_ptr = nullptr;
+    g_debugger_list_mutex_ptr = nullptr;
   }
 }
 

lldb/source/Initialization/SystemInitializerCommon.cpp

@@ -101,4 +101,5 @@ void SystemInitializerCommon::Terminate() {
   Log::DisableAllLogChannels();
   FileSystem::Terminate();
   Diagnostics::Terminate();
+  TerminateLldbChannel();
 }

lldb/source/Utility/LLDBLog.cpp

@@ -87,3 +87,5 @@ template <> Log::Channel &lldb_private::LogChannelFor<LLDBLog>() {
 void lldb_private::InitializeLldbChannel() {
   Log::Register("lldb", g_log_channel);
 }
+
+void lldb_private::TerminateLldbChannel() { Log::Unregister("lldb"); }

lldb/test/API/tools/lldb-dap/cancel/TestDAP_cancel.py

@@ -2,8 +2,6 @@
 Test lldb-dap cancel request
 """
 
-import time
-
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 import lldbdap_testcase

lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py

@@ -128,6 +128,7 @@ def run_test_evaluate_expressions(
         self.assertEvaluate("var1", "20", want_type="int")
         # Empty expression should equate to the previous expression.
         if context == "repl":
+            self.assertEvaluate("p var1", "20")
             self.assertEvaluate("", "20")
         else:
             self.assertEvaluateFailure("")