Author: Michael Buch Date: 2024-11-18T16:15:06Z New Revision: ceeb08b9e0a51a4d2e0804baeb579fe8a6485885
URL: https://github.com/llvm/llvm-project/commit/ceeb08b9e0a51a4d2e0804baeb579fe8a6485885 DIFF: https://github.com/llvm/llvm-project/commit/ceeb08b9e0a51a4d2e0804baeb579fe8a6485885.diff LOG: Revert "[lldb-dap] Support column breakpoints (#113787)" This reverts commit 4f48a81a620bc9280be4780f3554cdc9bda55bd3. The newly added test was failing on the public macOS Arm64 bots: ``` ====================================================================== FAIL: test_column_breakpoints (TestDAP_breakpointLocations.TestDAP_setBreakpoints) Test retrieving the available breakpoint locations. ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/llvm-project/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py", line 77, in test_column_breakpoints self.assertEqual( AssertionError: Lists differ: [{'co[70 chars]e': 41}, {'column': 3, 'line': 42}, {'column': 18, 'line': 42}] != [{'co[70 chars]e': 42}, {'column': 18, 'line': 42}] First differing element 2: {'column': 3, 'line': 41} {'column': 3, 'line': 42} First list contains 1 additional elements. First extra element 4: {'column': 18, 'line': 42} [{'column': 39, 'line': 40}, {'column': 51, 'line': 40}, - {'column': 3, 'line': 41}, {'column': 3, 'line': 42}, {'column': 18, 'line': 42}] Config=arm64-/Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/lldb-build/bin/clang ---------------------------------------------------------------------- Ran 1 test in 1.554s FAILED (failures=1) ``` Added: Modified: lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py lldb/test/API/tools/lldb-dap/breakpoint/Makefile lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py lldb/tools/lldb-dap/DAP.h lldb/tools/lldb-dap/lldb-dap.cpp Removed: lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py index 043d82e2e2c7d14..c29992ce9c7848e 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py @@ -612,28 +612,6 @@ def request_attach( command_dict = {"command": "attach", "type": "request", "arguments": args_dict} return self.send_recv(command_dict) - def request_breakpointLocations( - self, file_path, line, end_line=None, column=None, end_column=None - ): - (dir, base) = os.path.split(file_path) - source_dict = {"name": base, "path": file_path} - args_dict = {} - args_dict["source"] = source_dict - if line is not None: - args_dict["line"] = line - if end_line is not None: - args_dict["endLine"] = end_line - if column is not None: - args_dict["column"] = column - if end_column is not None: - args_dict["endColumn"] = end_column - command_dict = { - "command": "breakpointLocations", - "type": "request", - "arguments": args_dict, - } - return self.send_recv(command_dict) - def request_configurationDone(self): command_dict = { "command": "configurationDone", @@ -873,8 +851,6 @@ def request_next(self, threadId, granularity="statement"): def request_stepIn(self, threadId, targetId, granularity="statement"): if self.exit_status is not None: raise ValueError("request_stepIn called after process exited") - if threadId is None: - threadId = self.get_thread_id() args_dict = { "threadId": threadId, "targetId": targetId, @@ -935,14 +911,18 @@ def request_setBreakpoints(self, file_path, line_array, data=None): breakpoint_data = data[i] bp = {"line": line} if breakpoint_data is not None: - if breakpoint_data.get("condition"): + if "condition" in breakpoint_data and breakpoint_data["condition"]: bp["condition"] = breakpoint_data["condition"] - if breakpoint_data.get("hitCondition"): + if ( + "hitCondition" in breakpoint_data + and breakpoint_data["hitCondition"] + ): bp["hitCondition"] = breakpoint_data["hitCondition"] - if breakpoint_data.get("logMessage"): + if ( + "logMessage" in breakpoint_data + and breakpoint_data["logMessage"] + ): bp["logMessage"] = breakpoint_data["logMessage"] - if breakpoint_data.get("column"): - bp["column"] = breakpoint_data["column"] breakpoints.append(bp) args_dict["breakpoints"] = breakpoints diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py index 34e9b96dbcc3f52..a25466f07fa557f 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py @@ -238,10 +238,9 @@ def set_global(self, name, value, id=None): def stepIn( self, threadId=None, targetId=None, waitForStop=True, granularity="statement" ): - response = self.dap_server.request_stepIn( + self.dap_server.request_stepIn( threadId=threadId, targetId=targetId, granularity=granularity ) - self.assertTrue(response["success"]) if waitForStop: return self.dap_server.wait_for_stopped() return None diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/Makefile b/lldb/test/API/tools/lldb-dap/breakpoint/Makefile index 06438b3e6e3139e..7634f513e852338 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/Makefile +++ b/lldb/test/API/tools/lldb-dap/breakpoint/Makefile @@ -16,4 +16,4 @@ main-copy.cpp: main.cpp # The following shared library will be used to test breakpoints under dynamic loading libother: other-copy.c "$(MAKE)" -f $(MAKEFILE_RULES) \ - DYLIB_ONLY=YES DYLIB_C_SOURCES=other-copy.c DYLIB_NAME=other + DYLIB_ONLY=YES DYLIB_C_SOURCES=other-copy.c DYLIB_NAME=other diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py deleted file mode 100644 index 4803451bdc8aaa8..000000000000000 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py +++ /dev/null @@ -1,85 +0,0 @@ -""" -Test lldb-dap breakpointLocations request -""" - - -import dap_server -import shutil -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil -import lldbdap_testcase -import os - - -class TestDAP_setBreakpoints(lldbdap_testcase.DAPTestCaseBase): - def setUp(self): - lldbdap_testcase.DAPTestCaseBase.setUp(self) - - self.main_basename = "main-copy.cpp" - self.main_path = os.path.realpath(self.getBuildArtifact(self.main_basename)) - - @skipIfWindows - def test_column_breakpoints(self): - """Test retrieving the available breakpoint locations.""" - program = self.getBuildArtifact("a.out") - self.build_and_launch(program, stopOnEntry=True) - loop_line = line_number(self.main_path, "// break loop") - self.dap_server.request_continue() - - # Ask for the breakpoint locations based only on the line number - response = self.dap_server.request_breakpointLocations( - self.main_path, loop_line - ) - self.assertTrue(response["success"]) - self.assertEqual( - response["body"]["breakpoints"], - [ - {"line": loop_line, "column": 9}, - {"line": loop_line, "column": 13}, - {"line": loop_line, "column": 20}, - {"line": loop_line, "column": 23}, - {"line": loop_line, "column": 25}, - {"line": loop_line, "column": 34}, - {"line": loop_line, "column": 37}, - {"line": loop_line, "column": 39}, - {"line": loop_line, "column": 51}, - ], - ) - - # Ask for the breakpoint locations for a column range - response = self.dap_server.request_breakpointLocations( - self.main_path, - loop_line, - column=24, - end_column=46, - ) - self.assertTrue(response["success"]) - self.assertEqual( - response["body"]["breakpoints"], - [ - {"line": loop_line, "column": 25}, - {"line": loop_line, "column": 34}, - {"line": loop_line, "column": 37}, - {"line": loop_line, "column": 39}, - ], - ) - - # Ask for the breakpoint locations for a range of line numbers - response = self.dap_server.request_breakpointLocations( - self.main_path, - line=loop_line, - end_line=loop_line + 2, - column=39, - ) - self.maxDiff = None - self.assertTrue(response["success"]) - self.assertEqual( - response["body"]["breakpoints"], - [ - {"column": 39, "line": 40}, - {"column": 51, "line": 40}, - {"column": 3, "line": 42}, - {"column": 18, "line": 42}, - ], - ) diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py index c62feda64a12546..123fea79c5cda82 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py @@ -125,18 +125,20 @@ def test_set_and_clear(self): # Set 3 breakpoints and verify that they got set correctly response = self.dap_server.request_setBreakpoints(self.main_path, lines) line_to_id = {} - breakpoints = response["body"]["breakpoints"] - self.assertEqual( - len(breakpoints), - len(lines), - "expect %u source breakpoints" % (len(lines)), - ) - for index, breakpoint in enumerate(breakpoints): - line = breakpoint["line"] - self.assertEqual(line, lines[index]) - # Store the "id" of the breakpoint that was set for later - line_to_id[line] = breakpoint["id"] - self.assertTrue(breakpoint["verified"], "expect breakpoint verified") + if response: + breakpoints = response["body"]["breakpoints"] + self.assertEqual( + len(breakpoints), + len(lines), + "expect %u source breakpoints" % (len(lines)), + ) + for breakpoint, index in zip(breakpoints, range(len(lines))): + line = breakpoint["line"] + self.assertTrue(line, lines[index]) + # Store the "id" of the breakpoint that was set for later + line_to_id[line] = breakpoint["id"] + self.assertIn(line, lines, "line expected in lines array") + self.assertTrue(breakpoint["verified"], "expect breakpoint verified") # There is no breakpoint delete packet, clients just send another # setBreakpoints packet with the same source file with fewer lines. @@ -149,66 +151,75 @@ def test_set_and_clear(self): # Set 2 breakpoints and verify that the previous breakpoints that were # set above are still set. response = self.dap_server.request_setBreakpoints(self.main_path, lines) - breakpoints = response["body"]["breakpoints"] - self.assertEqual( - len(breakpoints), - len(lines), - "expect %u source breakpoints" % (len(lines)), - ) - for index, breakpoint in enumerate(breakpoints): - line = breakpoint["line"] - self.assertEqual(line, lines[index]) - # Verify the same breakpoints are still set within LLDB by - # making sure the breakpoint ID didn't change + if response: + breakpoints = response["body"]["breakpoints"] self.assertEqual( - line_to_id[line], - breakpoint["id"], - "verify previous breakpoints stayed the same", + len(breakpoints), + len(lines), + "expect %u source breakpoints" % (len(lines)), ) - self.assertTrue(breakpoint["verified"], "expect breakpoint still verified") + for breakpoint, index in zip(breakpoints, range(len(lines))): + line = breakpoint["line"] + self.assertTrue(line, lines[index]) + # Verify the same breakpoints are still set within LLDB by + # making sure the breakpoint ID didn't change + self.assertEqual( + line_to_id[line], + breakpoint["id"], + "verify previous breakpoints stayed the same", + ) + self.assertIn(line, lines, "line expected in lines array") + self.assertTrue( + breakpoint["verified"], "expect breakpoint still verified" + ) # Now get the full list of breakpoints set in the target and verify # we have only 2 breakpoints set. The response above could have told # us about 2 breakpoints, but we want to make sure we don't have the # third one still set in the target response = self.dap_server.request_testGetTargetBreakpoints() - breakpoints = response["body"]["breakpoints"] - self.assertEqual( - len(breakpoints), - len(lines), - "expect %u source breakpoints" % (len(lines)), - ) - for breakpoint in breakpoints: - line = breakpoint["line"] - # Verify the same breakpoints are still set within LLDB by - # making sure the breakpoint ID didn't change + if response: + breakpoints = response["body"]["breakpoints"] self.assertEqual( - line_to_id[line], - breakpoint["id"], - "verify previous breakpoints stayed the same", + len(breakpoints), + len(lines), + "expect %u source breakpoints" % (len(lines)), ) - self.assertIn(line, lines, "line expected in lines array") - self.assertTrue(breakpoint["verified"], "expect breakpoint still verified") + for breakpoint in breakpoints: + line = breakpoint["line"] + # Verify the same breakpoints are still set within LLDB by + # making sure the breakpoint ID didn't change + self.assertEqual( + line_to_id[line], + breakpoint["id"], + "verify previous breakpoints stayed the same", + ) + self.assertIn(line, lines, "line expected in lines array") + self.assertTrue( + breakpoint["verified"], "expect breakpoint still verified" + ) # Now clear all breakpoints for the source file by passing down an # empty lines array lines = [] response = self.dap_server.request_setBreakpoints(self.main_path, lines) - breakpoints = response["body"]["breakpoints"] - self.assertEqual( - len(breakpoints), - len(lines), - "expect %u source breakpoints" % (len(lines)), - ) + if response: + breakpoints = response["body"]["breakpoints"] + self.assertEqual( + len(breakpoints), + len(lines), + "expect %u source breakpoints" % (len(lines)), + ) # Verify with the target that all breakpoints have been cleared response = self.dap_server.request_testGetTargetBreakpoints() - breakpoints = response["body"]["breakpoints"] - self.assertEqual( - len(breakpoints), - len(lines), - "expect %u source breakpoints" % (len(lines)), - ) + if response: + breakpoints = response["body"]["breakpoints"] + self.assertEqual( + len(breakpoints), + len(lines), + "expect %u source breakpoints" % (len(lines)), + ) # Now set a breakpoint again in the same source file and verify it # was added. @@ -270,11 +281,12 @@ def test_clear_breakpoints_unset_breakpoints(self): self.assertEqual( len(breakpoints), len(lines), "expect %u source breakpoints" % (len(lines)) ) - for index, breakpoint in enumerate(breakpoints): + for breakpoint, index in zip(breakpoints, range(len(lines))): line = breakpoint["line"] - self.assertEqual(line, lines[index]) + self.assertTrue(line, lines[index]) # Store the "id" of the breakpoint that was set for later line_to_id[line] = breakpoint["id"] + self.assertIn(line, lines, "line expected in lines array") self.assertTrue(breakpoint["verified"], "expect breakpoint verified") # Now clear all breakpoints for the source file by not setting the @@ -344,49 +356,3 @@ def test_functionality(self): self.continue_to_breakpoints(breakpoint_ids) i = int(self.dap_server.get_local_variable_value("i")) self.assertEqual(i, 7, "i != 7 showing post hitCondition hits every time") - - @skipIfWindows - def test_column_breakpoints(self): - """Test setting multiple breakpoints in the same line at diff erent columns.""" - loop_line = line_number("main.cpp", "// break loop") - - program = self.getBuildArtifact("a.out") - self.build_and_launch(program) - - # Set two breakpoints on the loop line at diff erent columns. - columns = [13, 39] - response = self.dap_server.request_setBreakpoints( - self.main_path, [loop_line, loop_line], list({"column": c} for c in columns) - ) - - # Verify the breakpoints were set correctly - breakpoints = response["body"]["breakpoints"] - breakpoint_ids = [] - self.assertEqual( - len(breakpoints), - len(columns), - "expect %u source breakpoints" % (len(columns)), - ) - for index, breakpoint in enumerate(breakpoints): - self.assertEqual(breakpoint["line"], loop_line) - self.assertEqual(breakpoint["column"], columns[index]) - self.assertTrue(breakpoint["verified"], "expect breakpoint verified") - breakpoint_ids.append(breakpoint["id"]) - - # Continue to the first breakpoint, - self.continue_to_breakpoints([breakpoint_ids[0]]) - - # We should have stopped right before the call to `twelve`. - # Step into and check we are inside `twelve`. - self.stepIn() - func_name = self.get_stackFrames()[0]["name"] - self.assertEqual(func_name, "twelve(int)") - - # Continue to the second breakpoint. - self.continue_to_breakpoints([breakpoint_ids[1]]) - - # We should have stopped right before the call to `fourteen`. - # Step into and check we are inside `fourteen`. - self.stepIn() - func_name = self.get_stackFrames()[0]["name"] - self.assertEqual(func_name, "a::fourteen(int)") diff --git a/lldb/tools/lldb-dap/DAP.h b/lldb/tools/lldb-dap/DAP.h index c83af0ae0aefd49..ae496236f13369c 100644 --- a/lldb/tools/lldb-dap/DAP.h +++ b/lldb/tools/lldb-dap/DAP.h @@ -48,8 +48,7 @@ namespace lldb_dap { -typedef llvm::DenseMap<std::pair<uint32_t, uint32_t>, SourceBreakpoint> - SourceBreakpointMap; +typedef llvm::DenseMap<uint32_t, SourceBreakpoint> SourceBreakpointMap; typedef llvm::StringMap<FunctionBreakpoint> FunctionBreakpointMap; typedef llvm::DenseMap<lldb::addr_t, InstructionBreakpoint> InstructionBreakpointMap; diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp index 1590a668ad9008f..3bfc578806021ee 100644 --- a/lldb/tools/lldb-dap/lldb-dap.cpp +++ b/lldb/tools/lldb-dap/lldb-dap.cpp @@ -907,196 +907,6 @@ void request_attach(DAP &dap, const llvm::json::Object &request) { } } -// "BreakpointLocationsRequest": { -// "allOf": [ { "$ref": "#/definitions/Request" }, { -// "type": "object", -// "description": "The `breakpointLocations` request returns all possible -// locations for source breakpoints in a given range.\nClients should only -// call this request if the corresponding capability -// `supportsBreakpointLocationsRequest` is true.", -// "properties": { -// "command": { -// "type": "string", -// "enum": [ "breakpointLocations" ] -// }, -// "arguments": { -// "$ref": "#/definitions/BreakpointLocationsArguments" -// } -// }, -// "required": [ "command" ] -// }] -// }, -// "BreakpointLocationsArguments": { -// "type": "object", -// "description": "Arguments for `breakpointLocations` request.", -// "properties": { -// "source": { -// "$ref": "#/definitions/Source", -// "description": "The source location of the breakpoints; either -// `source.path` or `source.sourceReference` must be specified." -// }, -// "line": { -// "type": "integer", -// "description": "Start line of range to search possible breakpoint -// locations in. If only the line is specified, the request returns all -// possible locations in that line." -// }, -// "column": { -// "type": "integer", -// "description": "Start position within `line` to search possible -// breakpoint locations in. It is measured in UTF-16 code units and the -// client capability `columnsStartAt1` determines whether it is 0- or -// 1-based. If no column is given, the first position in the start line is -// assumed." -// }, -// "endLine": { -// "type": "integer", -// "description": "End line of range to search possible breakpoint -// locations in. If no end line is given, then the end line is assumed to -// be the start line." -// }, -// "endColumn": { -// "type": "integer", -// "description": "End position within `endLine` to search possible -// breakpoint locations in. It is measured in UTF-16 code units and the -// client capability `columnsStartAt1` determines whether it is 0- or -// 1-based. If no end column is given, the last position in the end line -// is assumed." -// } -// }, -// "required": [ "source", "line" ] -// }, -// "BreakpointLocationsResponse": { -// "allOf": [ { "$ref": "#/definitions/Response" }, { -// "type": "object", -// "description": "Response to `breakpointLocations` request.\nContains -// possible locations for source breakpoints.", -// "properties": { -// "body": { -// "type": "object", -// "properties": { -// "breakpoints": { -// "type": "array", -// "items": { -// "$ref": "#/definitions/BreakpointLocation" -// }, -// "description": "Sorted set of possible breakpoint locations." -// } -// }, -// "required": [ "breakpoints" ] -// } -// }, -// "required": [ "body" ] -// }] -// }, -// "BreakpointLocation": { -// "type": "object", -// "description": "Properties of a breakpoint location returned from the -// `breakpointLocations` request.", -// "properties": { -// "line": { -// "type": "integer", -// "description": "Start line of breakpoint location." -// }, -// "column": { -// "type": "integer", -// "description": "The start position of a breakpoint location. Position -// is measured in UTF-16 code units and the client capability -// `columnsStartAt1` determines whether it is 0- or 1-based." -// }, -// "endLine": { -// "type": "integer", -// "description": "The end line of breakpoint location if the location -// covers a range." -// }, -// "endColumn": { -// "type": "integer", -// "description": "The end position of a breakpoint location (if the -// location covers a range). Position is measured in UTF-16 code units and -// the client capability `columnsStartAt1` determines whether it is 0- or -// 1-based." -// } -// }, -// "required": [ "line" ] -// }, -void request_breakpointLocations(DAP &dap, const llvm::json::Object &request) { - llvm::json::Object response; - FillResponse(request, response); - auto *arguments = request.getObject("arguments"); - auto *source = arguments->getObject("source"); - std::string path = GetString(source, "path").str(); - uint64_t start_line = GetUnsigned(arguments, "line", 0); - uint64_t start_column = GetUnsigned(arguments, "column", 0); - uint64_t end_line = GetUnsigned(arguments, "endLine", start_line); - uint64_t end_column = - GetUnsigned(arguments, "endColumn", std::numeric_limits<uint64_t>::max()); - - lldb::SBFileSpec file_spec(path.c_str(), true); - lldb::SBSymbolContextList compile_units = - dap.target.FindCompileUnits(file_spec); - - // Find all relevant lines & columns - llvm::SmallVector<std::pair<uint32_t, uint32_t>, 8> locations; - for (uint32_t c_idx = 0, c_limit = compile_units.GetSize(); c_idx < c_limit; - ++c_idx) { - const lldb::SBCompileUnit &compile_unit = - compile_units.GetContextAtIndex(c_idx).GetCompileUnit(); - if (!compile_unit.IsValid()) - continue; - lldb::SBFileSpec primary_file_spec = compile_unit.GetFileSpec(); - - // Go through the line table and find all matching lines / columns - for (uint32_t l_idx = 0, l_limit = compile_unit.GetNumLineEntries(); - l_idx < l_limit; ++l_idx) { - lldb::SBLineEntry line_entry = compile_unit.GetLineEntryAtIndex(l_idx); - - // Filter by line / column - uint32_t line = line_entry.GetLine(); - if (line < start_line || line > end_line) - continue; - uint32_t column = line_entry.GetColumn(); - if (column == LLDB_INVALID_COLUMN_NUMBER) - continue; - if (line == start_line && column < start_column) - continue; - if (line == end_line && column > end_column) - continue; - - // Make sure we are in the right file. - // We might have a match on line & column range and still - // be in the wrong file, e.g. for included files. - // Given that the involved pointers point into LLDB's string pool, - // we can directly compare the `const char*` pointers. - if (line_entry.GetFileSpec().GetFilename() != - primary_file_spec.GetFilename() || - line_entry.GetFileSpec().GetDirectory() != - primary_file_spec.GetDirectory()) - continue; - - locations.emplace_back(line, column); - } - } - - // The line entries are sorted by addresses, but we must return the list - // ordered by line / column position. - std::sort(locations.begin(), locations.end()); - locations.erase(std::unique(locations.begin(), locations.end()), - locations.end()); - - llvm::json::Array locations_json; - for (auto &l : locations) { - llvm::json::Object location; - location.try_emplace("line", l.first); - location.try_emplace("column", l.second); - locations_json.emplace_back(std::move(location)); - } - - llvm::json::Object body; - body.try_emplace("breakpoints", std::move(locations_json)); - response.try_emplace("body", std::move(body)); - dap.SendJSON(llvm::json::Value(std::move(response))); -} - // "ContinueRequest": { // "allOf": [ { "$ref": "#/definitions/Request" }, { // "type": "object", @@ -2124,8 +1934,6 @@ void request_initialize(DAP &dap, const llvm::json::Object &request) { body.try_emplace("supportsCompletionsRequest", true); // The debug adapter supports the disassembly request. body.try_emplace("supportsDisassembleRequest", true); - // The debug adapter supports the `breakpointLocations` request. - body.try_emplace("supportsBreakpointLocationsRequest", true); // The debug adapter supports stepping granularities (argument `granularity`) // for the stepping requests. body.try_emplace("supportsSteppingGranularity", true); @@ -2890,10 +2698,9 @@ void request_setBreakpoints(DAP &dap, const llvm::json::Object &request) { const auto *bp_obj = bp.getAsObject(); if (bp_obj) { SourceBreakpoint src_bp(dap, *bp_obj); - std::pair<uint32_t, uint32_t> bp_pos(src_bp.line, src_bp.column); - request_bps.try_emplace(bp_pos, src_bp); + request_bps.try_emplace(src_bp.line, src_bp); const auto [iv, inserted] = - dap.source_breakpoints[path].try_emplace(bp_pos, src_bp); + dap.source_breakpoints[path].try_emplace(src_bp.line, src_bp); // We check if this breakpoint already exists to update it if (inserted) iv->getSecond().SetBreakpoint(path.data()); @@ -4964,8 +4771,6 @@ void request_setInstructionBreakpoints(DAP &dap, void RegisterRequestCallbacks(DAP &dap) { dap.RegisterRequestCallback("attach", request_attach); - dap.RegisterRequestCallback("breakpointLocations", - request_breakpointLocations); dap.RegisterRequestCallback("completions", request_completions); dap.RegisterRequestCallback("continue", request_continue); dap.RegisterRequestCallback("configurationDone", request_configurationDone); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
