Shrink load method cache

python · markshannon · Jun 14, 2022 · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022
commit 56ea61a3739648d929f3a58c9f3ff659b1990702
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -58,21 +58,19 @@ typedef struct {
     _Py_CODEUNIT index;
 } _PyAttrCache;
 
-
-// MUST be the max(_PyAttrCache, _PyLoadMethodCache)
-#define INLINE_CACHE_ENTRIES_LOAD_ATTR CACHE_ENTRIES(_PyLoadMethodCache)
-
-#define INLINE_CACHE_ENTRIES_STORE_ATTR CACHE_ENTRIES(_PyAttrCache)
-
 typedef struct {
     _Py_CODEUNIT counter;
     _Py_CODEUNIT type_version[2];
-    _Py_CODEUNIT UNUSED;
     _Py_CODEUNIT keys_version[2];
     _Py_CODEUNIT descr[4];
 } _PyLoadMethodCache;
 
 
+// MUST be the max(_PyAttrCache, _PyLoadMethodCache)
+#define INLINE_CACHE_ENTRIES_LOAD_ATTR CACHE_ENTRIES(_PyLoadMethodCache)
+
+#define INLINE_CACHE_ENTRIES_STORE_ATTR CACHE_ENTRIES(_PyAttrCache)
+
 typedef struct {
     _Py_CODEUNIT counter;
     _Py_CODEUNIT func_version[2];

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -369,7 +369,6 @@ def jabs_op(name, op):
     "LOAD_ATTR": {
         "counter": 1,
         "version": 2,
-        "index": 1,
         "keys_version": 2,
         "descr": 4,
     },

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -366,7 +366,7 @@ def bug42562():
 
 %3d        LOAD_GLOBAL              0 (Exception)
            CHECK_EXC_MATCH
-           POP_JUMP_FORWARD_IF_FALSE    24 (to 84)
+           POP_JUMP_FORWARD_IF_FALSE    23 (to 82)
            STORE_FAST               0 (e)
 
 %3d        LOAD_FAST                0 (e)
@@ -983,7 +983,7 @@ def test_load_attr_specialize(self):
 
   1           2 LOAD_CONST               0 ('a')
               4 LOAD_ATTR_SLOT           0 (__class__)
-             26 RETURN_VALUE
+             24 RETURN_VALUE
 """
         co = compile("'a'.__class__", "", "eval")
         self.code_quicken(lambda: exec(co, {}, {}))