Update test/gdb

Author: brijkapadia

Lib/test/test_dict.py

@@ -1795,17 +1795,17 @@ def __hash__(self):
         self.assertRaises(Exc, dict_getitem_knownhash, d, k2, hash(k2))
 
     @support.cpython_only
-    def test_indices_layout(self):
+    def test_dict_keys_layout(self):
         _testinternalcapi = import_helper.import_module('_testinternalcapi')
-        check_layout = _testinternalcapi.test_dict_keys_layout
+        check_layout = _testinternalcapi.dict_keys_layout
 
         for i in range(4):
             self.assertTrue(check_layout({j: j for j in range(10**i)}))
 
     @support.cpython_only
     def test_dict_keys_to_base(self):
         _testinternalcapi = import_helper.import_module('_testinternalcapi')
-        check_base = _testinternalcapi.test_dict_keys_to_base
+        check_base = _testinternalcapi.dict_keys_to_base
 
         for i in range(4):
             self.assertTrue(check_base({j: j for j in range(10**i)}))

Modules/_testinternalcapi/dict.c

@@ -3,7 +3,7 @@
 #include "pycore_dict.h"
 
 static PyObject*
-test_dict_keys_layout(PyObject *self, PyObject *arg)
+dict_keys_layout(PyObject *self, PyObject *arg)
 {
     PyDictObject *mp = (PyDictObject *)arg;
     PyDictKeysObject *keys = mp->ma_keys;
@@ -22,7 +22,7 @@ test_dict_keys_layout(PyObject *self, PyObject *arg)
 }
 
 static PyObject*
-test_dict_keys_to_base(PyObject *self, PyObject *arg)
+dict_keys_to_base(PyObject *self, PyObject *arg)
 {
     PyDictObject *mp = (PyDictObject *)arg;
     PyDictKeysObject *keys = mp->ma_keys;
@@ -35,8 +35,8 @@ test_dict_keys_to_base(PyObject *self, PyObject *arg)
 }
 
 static PyMethodDef test_methods[] = {
-    {"test_dict_keys_layout", test_dict_keys_layout, METH_O},
-    {"test_dict_keys_to_base", test_dict_keys_to_base, METH_O},
+    {"dict_keys_layout", dict_keys_layout, METH_O},
+    {"dict_keys_to_base", dict_keys_to_base, METH_O},
     {NULL},
 };
 

Tools/gdb/libpython.py

@@ -846,25 +846,13 @@ def write_repr(self, out, visited):
     @staticmethod
     def _get_entries(keys):
         dk_nentries = int(keys['dk_nentries'])
-        dk_size = 1<<int(keys['dk_log2_size'])
-
-        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_addr = keys['dk_indices'].address
-        ent_addr = ent_addr.cast(_type_unsigned_char_ptr()) + offset
         if int(keys['dk_kind']) == 0:  # DICT_KEYS_GENERAL
             ent_ptr_t = gdb.lookup_type('PyDictKeyEntry').pointer()
         else:
             ent_ptr_t = gdb.lookup_type('PyDictUnicodeEntry').pointer()
-        ent_addr = ent_addr.cast(ent_ptr_t)
 
+        ent_addr = keys["dk_entries"].address.cast(ent_ptr_t)
         return ent_addr, dk_nentries