mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 10:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #28023: Fix python-gdb.py didn't support new dict implementation

Browse source
This commit is contained in:
INADA Naoki 2016-11-22 19:40:58 +09:00
parent f50a85df1f
commit d7d2bc8798
3 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Tools/gdb/libpython.py
View file

@ -666,8 +666,9 @@ class PyDictObjectPtr(PyObjectPtr):
'''
keys = self.field('ma_keys')
values = self.field('ma_values')
for i in safe_range(keys['dk_size']):
ep = keys['dk_entries'].address + i
entries, nentries = self._get_entries(keys)
for i in safe_range(nentries):
ep = entries[i]
if long(values):
pyop_value = PyObjectPtr.from_pyobject_ptr(values[i])
else:
@ -707,6 +708,29 @@ class PyDictObjectPtr(PyObjectPtr):
pyop_value.write_repr(out, visited)
out.write('}')
def _get_entries(self, keys):
dk_size = int(keys['dk_size'])
try:
# <= Python 3.5
return keys['dk_entries'], dk_size
except gdb.error:
# >= Python 3.6
pass
if dk_size <= 0xFF:
offset = dk_size
elif dk_size <= 0xFFFF:
offset = 2 * dk_size
elif dk_size <= 0xFFFFFFFF:
offset = 4 * dk_size
else:
offset = 8 * dk_size
ent_ptr_t = gdb.lookup_type('PyDictKeyEntry').pointer()
ent_addr = int(keys['dk_indices']['as_1'].address) + offset
return gdb.Value(ent_addr).cast(ent_ptr_t), int(keys['dk_nentries'])
class PyListObjectPtr(PyObjectPtr):
_typename = 'PyListObject'