Fix attach request handling

Author: qxy11

lldb/test/API/tools/lldb-dap/gpu/amd/TestDAP_gpu_reverse_request.py

@@ -100,8 +100,6 @@ def test_gpu_breakpoint_hit(self):
         self.do_continue_on(GPU_PROCESS_UNIQUE_ID)
         # Continue main session
         self.do_continue()
-        self.dap_server.wait_for_stopped()
-        self.do_continue()
         # Verify that the GPU breakpoint is hit in the child session
         self.verify_breakpoint_hit_on(GPU_PROCESS_UNIQUE_ID, gpu_breakpoint_ids, timeout=self.DEFAULT_TIMEOUT * 3)
 

lldb/tools/lldb-dap/DAP.cpp

@@ -1491,7 +1491,6 @@ void DAP::EventThread() {
           // target ID of the created target. The DAP instance will attach to
           // this existing target and the debug session will be ready to go.
           llvm::json::Object attach_config;
-          llvm::json::Array attach_commands;
 
           // If we have a process name, add command to attach to the same
           // process name

lldb/tools/lldb-dap/Handler/AttachRequestHandler.cpp

@@ -86,10 +86,10 @@ Error AttachRequestHandler::Run(const AttachRequestArguments &args) const {
   if (error.Fail())
     return ToError(error);
   dap.SetTarget(target);
-
   // Run any pre run LLDB commands the user specified in the launch.json
-  if (Error err = dap.RunPreRunCommands())
+  if (Error err = dap.RunPreRunCommands()) {
     return err;
+  }
 
   if ((args.pid == LLDB_INVALID_PROCESS_ID ||
        args.gdbRemotePort == LLDB_DAP_INVALID_PORT) &&
@@ -131,7 +131,7 @@ Error AttachRequestHandler::Run(const AttachRequestArguments &args) const {
       connect_url += std::to_string(args.gdbRemotePort);
       dap.target.ConnectRemote(listener, connect_url.c_str(), "gdb-remote",
                                error);
-    } else {
+    } else if (!target_id.has_value()) {
       // Attach by pid or process name.
       lldb::SBAttachInfo attach_info;
       if (args.pid != LLDB_INVALID_PROCESS_ID)