From 61830fcb31d9b66c7af76eefc152b66a170fb49c Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Fri, 1 Sep 2023 16:02:19 -0500 Subject: [PATCH] gdb/dap: use breakpoint fullname to resolve source If the breakpoint has a fullname, use that as the source path when resolving the breakpoint source information. This is consistent with other callers of make_source which also use "fullname" if it exists (see e.g. DAPFrameDecorator which returns the symtab's fullname). Approved-By: Tom Tromey --- gdb/python/lib/gdb/dap/breakpoint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index bf062985671..8518814a8d2 100644 --- a/gdb/python/lib/gdb/dap/breakpoint.py +++ b/gdb/python/lib/gdb/dap/breakpoint.py @@ -108,6 +108,9 @@ def _breakpoint_descriptor(bp): loc = bp.locations[0] if loc.source: (filename, line) = loc.source + if loc.fullname is not None: + filename = loc.fullname + result.update( { "source": make_source(filename, os.path.basename(filename)), @@ -118,9 +121,6 @@ def _breakpoint_descriptor(bp): if loc.address: result["instructionReference"] = hex(loc.address), - path = loc.fullname - if path is not None: - result["source"]["path"] = path return result -- 2.30.2