summaryrefslogtreecommitdiffstats
path: root/Tools/gdb/libpython.py
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2016-11-22 10:40:58 (GMT)
committerINADA Naoki <songofacandy@gmail.com>2016-11-22 10:40:58 (GMT)
commitd7d2bc8798da3b083e383e949ba01d61b78e4e4d (patch)
tree4a7a70efc239dee12b18ce9155e597859eda2ccb /Tools/gdb/libpython.py
parentf50a85df1f2bcb58f31381369bc506036c1f0928 (diff)
downloadcpython-d7d2bc8798da3b083e383e949ba01d61b78e4e4d.zip
cpython-d7d2bc8798da3b083e383e949ba01d61b78e4e4d.tar.gz
cpython-d7d2bc8798da3b083e383e949ba01d61b78e4e4d.tar.bz2
Issue #28023: Fix python-gdb.py didn't support new dict implementation
Diffstat (limited to 'Tools/gdb/libpython.py')
-rwxr-xr-xTools/gdb/libpython.py28
1 files changed, 26 insertions, 2 deletions
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 3e95b44..964cc9f 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -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'