[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

[victor.stinner]

https://hg.python.org/cpython/rev/19adf22d6a5b
changeset:   105334:19adf22d6a5b
parent:      105332:c51045920410
parent:      105333:9b974f988c95
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 22 13:10:02 2016 +0100
summary:
  Merge 3.6

files:
  Tools/gdb/libpython.py |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -709,6 +709,7 @@
         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 @@
         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):

-- 
Repository URL: https://hg.python.org/cpython