maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[lldb][bindings] Fix module_access handling of regex" 

This reverts commit 75f05fccbb.

This commit broke the windows lldb bot: https://lab.llvm.org/buildbot/#/builders/83/builds/23284
This commit is contained in:
Stella Stamenova 2022-09-06 08:57:28 -07:00
parent a7c6cdc5cf
commit bd323e42c8
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/bindings/interface/SBTarget.i
View File

@ -1000,10 +1000,10 @@ public:
def __getitem__(self, key):
num_modules = self.sbtarget.GetNumModules()
if isinstance(key, int):
if type(key) is int:
if key < num_modules:
return self.sbtarget.GetModuleAtIndex(key)
elif isinstance(key, str):
elif type(key) is str:
if key.find('/') == -1:
for idx in range(num_modules):
module = self.sbtarget.GetModuleAtIndex(idx)
@ -1024,16 +1024,16 @@ public:
return module
except:
return None
elif isinstance(key, uuid.UUID):
elif type(key) is uuid.UUID:
for idx in range(num_modules):
module = self.sbtarget.GetModuleAtIndex(idx)
if module.uuid == key:
return module
elif isinstance(key, re.Pattern):
elif type(key) is re.SRE_Pattern:
matching_modules = []
for idx in range(num_modules):
module = self.sbtarget.GetModuleAtIndex(idx)
re_match = key.search(module.file.fullpath)
re_match = key.search(module.path.fullpath)
if re_match:
matching_modules.append(module)
return matching_modules

12
lldb/test/API/python_api/target/TestTargetAPI.py
View File

@ -2,7 +2,6 @@
Test SBTarget APIs.
"""
import re
import unittest2
import os
import lldb
@ -517,14 +516,3 @@ class TargetAPITestCase(TestBase):
module = target.GetModuleAtIndex(i)
self.assertTrue(target.IsLoaded(module), "Running the target should "
"have loaded its modules.")
def test_module_subscript_regex(self):
"""Exercise SBTarget.module subscripting with regex."""
self.build()
exe = self.getBuildArtifact("a.out")
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
modules = target.module[re.compile(r"/a[.]out$")]
self.assertEqual(len(modules), 1)
exe_mod = modules[0]
self.assertEqual(exe_mod.file.fullpath, exe)