Adjusting includes and when we call CancelInterruptRequest.

Author: ashgti

lldb/tools/lldb-dap/DAP.cpp

@@ -700,6 +700,10 @@ bool DAP::HandleObject(const Message &M) {
     {
       std::lock_guard<std::mutex> lock(m_active_request_mutex);
       m_active_request = req;
+
+      // Clear interrupt marker prior to handling the next request.
+      if (debugger.InterruptRequested())
+        debugger.CancelInterruptRequest();
     }
 
     auto cleanup = llvm::make_scope_exit([&]() {
@@ -718,10 +722,6 @@ bool DAP::HandleObject(const Message &M) {
       }
     }
 
-    // Clear interrupt marker prior to handling the next request.
-    if (debugger.InterruptRequested())
-      debugger.CancelInterruptRequest();
-
     auto handler_pos = request_handlers.find(req->command);
     if (handler_pos != request_handlers.end()) {
       (*handler_pos->second)(*req);

lldb/tools/lldb-dap/DAP.h

@@ -39,7 +39,9 @@
 #include "llvm/Support/Error.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/Threading.h"
+#include <condition_variable>
 #include <cstdint>
+#include <deque>
 #include <memory>
 #include <mutex>
 #include <optional>