diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-11-22 12:10:02 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-11-22 12:10:02 (GMT) |
| commit | 9ad8a639f37ded33154da1b12cddd46ab764495b (patch) | |
| tree | df9432a8e82fd26288570626926ea102d04fabac /Tools | |
| parent | ff33c93f23646aacfac42d50d72961b3858f91e8 (diff) | |
| parent | 3a5d79fbc87a70e733edc2de1bed35f6e14000a4 (diff) | |
| download | cpython-9ad8a639f37ded33154da1b12cddd46ab764495b.zip cpython-9ad8a639f37ded33154da1b12cddd46ab764495b.tar.gz cpython-9ad8a639f37ded33154da1b12cddd46ab764495b.tar.bz2 | |
Merge 3.6
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/gdb/libpython.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 964cc9f..e4d2c1e 100755 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -709,6 +709,7 @@ class PyDictObjectPtr(PyObjectPtr): out.write('}') def _get_entries(self, keys): + dk_nentries = int(keys['dk_nentries']) dk_size = int(keys['dk_size']) try: # <= Python 3.5 @@ -726,9 +727,12 @@ class PyDictObjectPtr(PyObjectPtr): else: offset = 8 * dk_size + ent_addr = keys['dk_indices']['as_1'].address + ent_addr = ent_addr.cast(_type_unsigned_char_ptr()) + offset 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']) + ent_addr = ent_addr.cast(ent_ptr_t) + + return ent_addr, dk_nentries class PyListObjectPtr(PyObjectPtr): |