Fix merge changes and fix building on existing ci bots servers.

Author: ashgti

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

@@ -27,8 +27,13 @@
     TypeVar,
     Generic,
     cast,
+    TYPE_CHECKING,
 )
-from typing_extensions import Unpack
+
+if TYPE_CHECKING:
+    # FIXME: Add mypy and typing_extensions to the requirements.txt once all
+    # build bots support the library.
+    from typing_extensions import Unpack
 
 ## DAP type references
 
@@ -740,10 +745,9 @@ def replay_packets(self, replay_file_path):
                     print("error: didn't get a valid response")
                 mode = "invalid"
 
-    def request_attach(self, **kwargs: Unpack[AttachArguments]):
+    def request_attach(self, **kwargs: "Unpack[AttachArguments]"):
         # Remove any default (empty) values.
         attach_args = cast(AttachArguments, {k: v for k, v in kwargs.items() if v})
-        attach_args.setdefault("disableASLR", True)
         attach_args.setdefault("initCommands", [])
         attach_args["initCommands"] = [
             *self.init_commands,
@@ -932,7 +936,7 @@ def request_initialize(self, sourceInitFile=False):
                 self.initialize_body = response["body"]
         return response
 
-    def request_launch(self, **kwargs: Unpack[LaunchArguments]):
+    def request_launch(self, **kwargs: "Unpack[LaunchArguments]"):
         # Remove any default (empty) values.
         launch_args = cast(LaunchArguments, {k: v for k, v in kwargs.items() if v})
         launch_args.setdefault("initCommands", [])

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

@@ -1,9 +1,13 @@
 import os
 import time
-from typing import Dict, Optional
-from typing_extensions import Unpack
+from typing import Dict, Optional, TYPE_CHECKING
 import uuid
 
+if TYPE_CHECKING:
+    # FIXME: Add mypy and typing_extensions to the requirements.txt once all
+    # build bots support the library.
+    from typing_extensions import Unpack
+
 from dap_server import (
     DebugAdapterServer,
     Source,
@@ -399,7 +403,7 @@ def attach(
         disconnectAutomatically=True,
         sourceInitFile=False,
         expectFailure=False,
-        **kwargs: Unpack[AttachArguments],
+        **kwargs: "Unpack[AttachArguments]",
     ):
         """Build the default Makefile target, create the DAP debug adapter,
         and attach to the process.
@@ -432,7 +436,7 @@ def launch(
         sourceInitFile=False,
         disconnectAutomatically=True,
         expectFailure=False,
-        **kwargs: Unpack[LaunchArguments],
+        **kwargs: "Unpack[LaunchArguments]",
     ):
         """Sending launch request to dap"""
 
@@ -464,7 +468,7 @@ def build_and_launch(
         /,
         *,
         adapter_env: Optional[Dict[str, str]] = None,
-        **kwargs: Unpack[LaunchArguments],
+        **kwargs: "Unpack[LaunchArguments]",
     ):
         """Build the default Makefile target, create the DAP debug adapter,
         and launch the process.