Skip to content

Commit 6c74a6f

Browse files
authored
Revert "[lldb-dap] Add support for data breakpoint. (#81541)" (#81812)
This reverts commit 8c56e78. Reverting to address the LLDB test failure in ARM64.
1 parent 94f5164 commit 6c74a6f

File tree

10 files changed

+34
-549
lines changed

10 files changed

+34
-549
lines changed

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

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -501,18 +501,6 @@ def get_local_variable_value(self, name, frameIndex=0, threadId=None):
501501
return variable["value"]
502502
return None
503503

504-
def get_local_variable_child(self, name, child_name, frameIndex=0, threadId=None):
505-
local = self.get_local_variable(name, frameIndex, threadId)
506-
if local["variablesReference"] == 0:
507-
return None
508-
children = self.request_variables(local["variablesReference"])["body"][
509-
"variables"
510-
]
511-
for child in children:
512-
if child["name"] == child_name:
513-
return child
514-
return None
515-
516504
def replay_packets(self, replay_file_path):
517505
f = open(replay_file_path, "r")
518506
mode = "invalid"
@@ -907,41 +895,6 @@ def request_setFunctionBreakpoints(self, names, condition=None, hitCondition=Non
907895
}
908896
return self.send_recv(command_dict)
909897

910-
def request_dataBreakpointInfo(
911-
self, variablesReference, name, frameIndex=0, threadId=None
912-
):
913-
stackFrame = self.get_stackFrame(frameIndex=frameIndex, threadId=threadId)
914-
if stackFrame is None:
915-
return []
916-
args_dict = {
917-
"variablesReference": variablesReference,
918-
"name": name,
919-
"frameId": stackFrame["id"],
920-
}
921-
command_dict = {
922-
"command": "dataBreakpointInfo",
923-
"type": "request",
924-
"arguments": args_dict,
925-
}
926-
return self.send_recv(command_dict)
927-
928-
def request_setDataBreakpoint(self, dataBreakpoints):
929-
"""dataBreakpoints is a list of dictionary with following fields:
930-
{
931-
dataId: (address in hex)/(size in bytes)
932-
accessType: read/write/readWrite
933-
[condition]: string
934-
[hitCondition]: string
935-
}
936-
"""
937-
args_dict = {"breakpoints": dataBreakpoints}
938-
command_dict = {
939-
"command": "setDataBreakpoints",
940-
"type": "request",
941-
"arguments": args_dict,
942-
}
943-
return self.send_recv(command_dict)
944-
945898
def request_compileUnits(self, moduleId):
946899
args_dict = {"moduleId": moduleId}
947900
command_dict = {

lldb/test/API/tools/lldb-dap/databreakpoint/Makefile

Lines changed: 0 additions & 3 deletions
This file was deleted.

lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py

Lines changed: 0 additions & 123 deletions
This file was deleted.

lldb/test/API/tools/lldb-dap/databreakpoint/main.cpp

Lines changed: 0 additions & 17 deletions
This file was deleted.

lldb/tools/lldb-dap/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ add_lldb_tool(lldb-dap
3737
RunInTerminal.cpp
3838
SourceBreakpoint.cpp
3939
DAP.cpp
40-
Watchpoint.cpp
4140

4241
LINK_LIBS
4342
liblldb

lldb/tools/lldb-dap/DAPForward.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ struct BreakpointBase;
1414
struct ExceptionBreakpoint;
1515
struct FunctionBreakpoint;
1616
struct SourceBreakpoint;
17-
struct Watchpoint;
1817
} // namespace lldb_dap
1918

2019
namespace lldb {
@@ -40,7 +39,6 @@ class SBStringList;
4039
class SBTarget;
4140
class SBThread;
4241
class SBValue;
43-
class SBWatchpoint;
4442
} // namespace lldb
4543

4644
#endif

lldb/tools/lldb-dap/Watchpoint.cpp

Lines changed: 0 additions & 48 deletions
This file was deleted.

lldb/tools/lldb-dap/Watchpoint.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)