From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 20 Apr 2018 20:02:30 +0000 (-0700)
Subject: bpo-33312: update Tools/gdb/libpython.py to match. (GH-6549)
X-Git-Tag: v3.7.0b4~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11659d00b9185c8f02ea6b642fa475a80e21f1a9;p=thirdparty%2FPython%2Fcpython.git

bpo-33312: update Tools/gdb/libpython.py to match. (GH-6549)

(cherry picked from commit 53f67d401df40486fd0fb8fbcf9da725cd37290c)
---

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 839ce799797e..7df7c9bd5416 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -730,7 +730,7 @@ class PyDictObjectPtr(PyObjectPtr):
         else:
             offset = 8 * dk_size
 
-        ent_addr = keys['dk_indices']['as_1'].address
+        ent_addr = keys['dk_indices'].address
         ent_addr = ent_addr.cast(_type_unsigned_char_ptr()) + offset
         ent_ptr_t = gdb.lookup_type('PyDictKeyEntry').pointer()
         ent_addr = ent_addr.cast(ent_ptr_t)