https://github.com/python/cpython/commit/d07e9ebbe89ce701e73d25777ae057da8dffd506
commit: d07e9ebbe89ce701e73d25777ae057da8dffd506
branch: main
author: Tomas R. <[email protected]>
committer: iritkatriel <[email protected]>
date: 2025-03-16T16:37:29Z
summary:
gh-131306: Remove unused code related to `BINARY_SUBSCR` (#131307)
files:
M Include/cpython/object.h
M Include/internal/pycore_code.h
M InternalDocs/frames.md
M Lib/opcode.py
M Lib/test/test_opcache.py
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index 70cf0b51f140a9..184aa63b3a5ed1 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -256,7 +256,7 @@ struct _specialization_cache {
// - If getitem is NULL, then getitem_version is meaningless.
// - If getitem->func_version == getitem_version, then getitem can be
called
// with two positional arguments and no keyword arguments, and has
neither
- // *args nor **kwargs (as required by BINARY_SUBSCR_GETITEM):
+ // *args nor **kwargs (as required by BINARY_OP_SUBSCR_GETITEM):
PyObject *getitem;
uint32_t getitem_version;
PyObject *init;
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index fa0e0bd01c99e9..c3edbb3dffe79b 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -118,12 +118,6 @@ typedef struct {
#define INLINE_CACHE_ENTRIES_COMPARE_OP CACHE_ENTRIES(_PyCompareOpCache)
-typedef struct {
- _Py_BackoffCounter counter;
-} _PyBinarySubscrCache;
-
-#define INLINE_CACHE_ENTRIES_BINARY_SUBSCR CACHE_ENTRIES(_PyBinarySubscrCache)
-
typedef struct {
_Py_BackoffCounter counter;
} _PySuperAttrCache;
diff --git a/InternalDocs/frames.md b/InternalDocs/frames.md
index aa996dfdf7b4a7..2f0cc7967f33f7 100644
--- a/InternalDocs/frames.md
+++ b/InternalDocs/frames.md
@@ -126,7 +126,7 @@ to see in an exception traceback.
The `return_offset` field determines where a `RETURN` should go in the caller,
relative to `instr_ptr`. It is only meaningful to the callee, so it needs to
be set in any instruction that implements a call (to a Python function),
-including CALL, SEND and BINARY_SUBSCR_GETITEM, among others. If there is no
+including CALL, SEND and BINARY_OP_SUBSCR_GETITEM, among others. If there is no
callee, then return_offset is meaningless. It is necessary to have a separate
field for the return offset because (1) if we apply this offset to `instr_ptr`
while executing the `RETURN`, this is too early and would lose us information
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 4ee0d64026bd0a..ea7c27698dd338 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -63,9 +63,6 @@
"CONTAINS_OP": {
"counter": 1,
},
- "BINARY_SUBSCR": {
- "counter": 1,
- },
"FOR_ITER": {
"counter": 1,
},
diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
index 946a4827fe7f4e..ce9c489f32cf7d 100644
--- a/Lib/test/test_opcache.py
+++ b/Lib/test/test_opcache.py
@@ -1706,7 +1706,7 @@ def binary_subscr_list_int():
binary_subscr_list_int()
self.assert_specialized(binary_subscr_list_int,
"BINARY_OP_SUBSCR_LIST_INT")
- self.assert_no_opcode(binary_subscr_list_int, "BINARY_SUBSCR")
+ self.assert_no_opcode(binary_subscr_list_int, "BINARY_OP")
def binary_subscr_tuple_int():
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
@@ -1717,7 +1717,7 @@ def binary_subscr_tuple_int():
binary_subscr_tuple_int()
self.assert_specialized(binary_subscr_tuple_int,
"BINARY_OP_SUBSCR_TUPLE_INT")
- self.assert_no_opcode(binary_subscr_tuple_int, "BINARY_SUBSCR")
+ self.assert_no_opcode(binary_subscr_tuple_int, "BINARY_OP")
def binary_subscr_dict():
for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
@@ -1737,7 +1737,7 @@ def binary_subscr_str_int():
binary_subscr_str_int()
self.assert_specialized(binary_subscr_str_int,
"BINARY_OP_SUBSCR_STR_INT")
- self.assert_no_opcode(binary_subscr_str_int, "BINARY_SUBSCR")
+ self.assert_no_opcode(binary_subscr_str_int, "BINARY_OP")
def binary_subscr_getitems():
class C:
@@ -1752,7 +1752,7 @@ def __getitem__(self, item):
binary_subscr_getitems()
self.assert_specialized(binary_subscr_getitems,
"BINARY_OP_SUBSCR_GETITEM")
- self.assert_no_opcode(binary_subscr_getitems, "BINARY_SUBSCR")
+ self.assert_no_opcode(binary_subscr_getitems, "BINARY_OP")
@cpython_only
@requires_specialization_ft
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
