Skip to content

Commit 9f14914

Browse files
Revert "Fix error in unrecognized register name handling for "SBFrame.register"" (#88468)
Reverts #88047. TestFrames.py is failing on x86_64 GreenDragon: https://green.lab.llvm.org/job/llvm.org/view/LLDB/job/lldb-cmake/983/
1 parent c24efff commit 9f14914

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

lldb/bindings/interface/SBFrameExtensions.i

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@ STRING_EXTENSION_OUTSIDE(SBFrame)
4444
def __init__(self, regs):
4545
self.regs = regs
4646

47-
def __iter__(self):
48-
return self.get_registers()
49-
50-
def get_registers(self):
51-
for i in range(0,len(self.regs)):
52-
rs = self.regs[i]
53-
for j in range (0,rs.num_children):
54-
reg = rs.GetChildAtIndex(j)
55-
yield reg
56-
5747
def __getitem__(self, key):
5848
if type(key) is str:
5949
for i in range(0,len(self.regs)):
@@ -62,7 +52,7 @@ STRING_EXTENSION_OUTSIDE(SBFrame)
6252
reg = rs.GetChildAtIndex(j)
6353
if reg.name == key: return reg
6454
else:
65-
return SBValue()
55+
return lldb.SBValue()
6656

6757
return registers_access(self.registers)
6858

lldb/test/API/python_api/frame/TestFrames.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,7 @@ def test_get_arg_vals_for_call_stack(self):
7373
gpr_reg_set = lldbutil.get_GPRs(frame)
7474
pc_value = gpr_reg_set.GetChildMemberWithName("pc")
7575
self.assertTrue(pc_value, "We should have a valid PC.")
76-
# Make sure we can also get this from the "register" property:
77-
iterator_pc_value = 0
78-
found_pc = False
79-
for reg in frame.register:
80-
if reg.name == "pc":
81-
found_pc = True
82-
iterator_pc_value = int(reg.GetValue(), 0)
83-
break
84-
8576
pc_value_int = int(pc_value.GetValue(), 0)
86-
self.assertTrue(found_pc, "Found the PC value in the register list")
87-
self.assertEqual(iterator_pc_value, pc_value_int, "The methods of finding pc match")
88-
8977
# Make sure on arm targets we dont mismatch PC value on the basis of thumb bit.
9078
# Frame PC will not have thumb bit set in case of a thumb
9179
# instruction as PC.

0 commit comments

Comments
 (0)