Merge branch 'main' into inline-cache-load-globals

markshannon · Feb 28, 2022 · Feb 18, 2022 · Feb 23, 2022 · Feb 25, 2022 · Feb 25, 2022
commit 138b2d66d3b6cca209f00770eda4886e5fa3340a
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -77,6 +77,10 @@ typedef struct {
 } _PyBinaryOpCache;
 
 #define INLINE_CACHE_ENTRIES_BINARY_OP CACHE_ENTRIES(_PyBinaryOpCache)
+typedef struct {
+    _Py_CODEUNIT counter;
+} _PyUnpackSequenceCache;
+
 
 #define INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE \
     (sizeof(_PyUnpackSequenceCache) / sizeof(_Py_CODEUNIT))

diff --git a/Include/opcode.h b/Include/opcode.h
@@ -388,7 +388,7 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.11a5 3479 (Add PUSH_NULL opcode)
 #     Python 3.11a5 3480 (New CALL opcodes, second iteration)
 #     Python 3.11a5 3481 (Use inline cache for BINARY_OP)
-#     Python 3.11a5 3482 (Use inline cache for LOAD_GLOBAL)
+#     Python 3.11a5 3482 (Use inline caching for UNPACK_SEQUENCE and LOAD_GLOBAL)
 
 #     Python 3.12 will start with magic number 3500