[all-commits] [llvm/llvm-project] c01240: Implement better path matching in FileSpecList::Fi...

Greg Clayton via All-commits all-commits at lists.llvm.org
Mon Aug 8 15:20:56 PDT 2022

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: c0124084537bad33180d2e675475baf1a4b79afe
  Author: Greg Clayton <gclayton at fb.com>
  Date:   2022-08-08 (Mon, 08 Aug 2022)

  Changed paths:
    M lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
    M lldb/include/lldb/Core/FileSpecList.h
    M lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
    M lldb/source/Core/FileSpecList.cpp
    M lldb/source/Symbol/CompileUnit.cpp
    M lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
    A lldb/test/API/functionalities/breakpoint/breakpoint_command/relative.yaml
    M lldb/unittests/Core/CMakeLists.txt
    A lldb/unittests/Core/FileSpecListTest.cpp

  Log Message:
  Implement better path matching in FileSpecList::FindCompatibleIndex(...).

Currently a FileSpecList::FindFileIndex(...) will only match the specified FileSpec if:
- it has filename and directory and both match exactly
- if has a filename only and any filename in the list matches

Because of this, we modify our breakpoint resolving so it can handle relative paths by doing some extra code that removes the directory from the FileSpec when searching if the path is relative.

This patch is intended to fix breakpoints so they work as users expect them to by adding the following features:
- allow matches to relative paths in the file list to match as long as the relative path is at the end of the specified path at valid directory delimiters
- allow matches to paths to match if the specified path is relative and shorter than the file paths in the list

This allows us to remove the extra logic from BreakpointResolverFileLine.cpp that added support for setting breakpoints with relative paths.

This means we can still set breakpoints with relative paths when the debug info contains full paths. We add the ability to set breakpoints with full paths when the debug info contains relative paths.

Debug info contains "./a/b/c/main.cpp", the following will set breakpoints successfully:
- /build/a/b/c/main.cpp
- a/b/c/main.cpp
- b/c/main.cpp
- c/main.cpp
- main.cpp
- ./c/main.cpp
- ./a/b/c/main.cpp
- ./b/c/main.cpp
- ./main.cpp

This also ensures that we won't match partial directory names, if a relative path is in the list or is used for the match, things must match at the directory level.

The breakpoint resolving code will now use the new FileSpecList::FindCompatibleIndex(...) function to allow this fuzzy matching to work for breakpoints.

Differential Revision: https://reviews.llvm.org/D130401

More information about the All-commits mailing list