Fixing post-merge issues.

ashgti · ashgti · commit 77130cae222a · 2025-04-03T11:55:56.000-07:00
diff --git a/lldb/tools/lldb-dap/DAP.cpp b/lldb/tools/lldb-dap/DAP.cpp
@@ -872,6 +872,9 @@ llvm::Error DAP::Loop() {
             continue;
           }
 
+          if (llvm::Error err = next.takeError())
+            return err;
+
           if (const protocol::Request *req =
                   std::get_if<protocol::Request>(&*next);
               req && req->command == "disconnect") {
diff --git a/lldb/tools/lldb-dap/DAP.h b/lldb/tools/lldb-dap/DAP.h
@@ -47,7 +47,6 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <set>
 #include <thread>
 #include <vector>
 

Original file line number	Diff line number	Diff line change
`@@ -872,6 +872,9 @@ llvm::Error DAP::Loop() {`
`872`	`872`	`continue;`
`873`	`873`	`}`
`874`	`874`
	`875`	`+ if (llvm::Error err = next.takeError())`
	`876`	`+ return err;`
	`877`	`+`
`875`	`878`	`if (const protocol::Request *req =`
`876`	`879`	`std::get_if<protocol::Request>(&*next);`
`877`	`880`	`req && req->command == "disconnect") {`