Skip to content

[lldb] Fix regex support in SBTarget.modules_access #116452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2024
Merged

[lldb] Fix regex support in SBTarget.modules_access #116452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/bindings/interface/SBTargetExtensions.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ STRING_EXTENSION_LEVEL_OUTSIDE(SBTarget, lldb::eDescriptionLevelBrief)
module = self.sbtarget.GetModuleAtIndex(idx)
if module.uuid == key:
return module
elif type(key) is re.SRE_Pattern:
elif isinstance(key, type(re.compile(''))):
matching_modules = []
for idx in range(num_modules):
module = self.sbtarget.GetModuleAtIndex(idx)
re_match = key.search(module.path.fullpath)
re_match = key.search(module.file.fullpath)
Copy link
Contributor Author

@kastiglione kastiglione Nov 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this was broken, and obviously not used, so I'd like to also change this from fullpath to basename. Opinions?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean you'd be able to search for modules just by the module's base name instead of the complete path? e.g. You could find libc++ with libc++ instead of /usr/lib/libc++.dylib or whatever.

If so, I'd be supportive of that kind of change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to find libc++ via regex, the alternatives regexes are:

  1. with fullpath: r"/libc\+\+"
  2. with basepath: r"^libc\+\+"

so the difference is a bit minor.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note that lookup supports string keys, one can write target.module["libc++.dylib"]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave such a change for a follow up.

if re_match:
matching_modules.append(module)
return matching_modules
Expand Down
15 changes: 6 additions & 9 deletions lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import os
import re
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
Expand Down Expand Up @@ -30,15 +31,11 @@ def test_stdcxx_disasm(self):
self.runCmd("disassemble -n '%s'" % function.GetName())

lib_stdcxx = "FAILHORRIBLYHERE"
# Iterate through the available modules, looking for stdc++ library...
for i in range(target.GetNumModules()):
module = target.GetModuleAtIndex(i)
fs = module.GetFileSpec()
if fs.GetFilename().startswith("libstdc++") or fs.GetFilename().startswith(
"libc++"
):
lib_stdcxx = str(fs)
break
# Find the stdc++ library...
stdlib_regex = re.compile(r"/lib(std)?c\+\+")
for module in target.module[stdlib_regex]:
lib_stdcxx = module.file.fullpath
break

# At this point, lib_stdcxx is the full path to the stdc++ library and
# module is the corresponding SBModule.
Expand Down
Loading